Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

diff: allow base switching between local or remote #507

Merged
merged 1 commit into from Nov 30, 2015

Conversation

Projects
None yet
1 participant
@odeke-em
Copy link
Owner

commented Nov 30, 2015

Fixes #506

Allows users to switch decide if local
is the base otherwise use remote.

remote as the base, local as the other

$ drive diff --base-local=false ls.txt 
File: /diff-test/ls.txt
* local:          2015-11-26T17:32:49.000Z                
* remote:         2015-11-26T17:32:09.000Z                
ls.txt
****

--- .xtmp5577006791947779410.tmp537523880   2015-11-29 20:11:18.000000000 -0700
+++ /Users/emmanuelodeke/emm.odeke@gmail.com/diff-test/ls.txt   2015-11-26 10:32:49.000000000 -0700
@@ -1,15 +1,6 @@
-02 Downtown (feat. Kidd Kidd).m4a
-About_A_Girl.mp3
-drop.avi
-sample.3gp
-sample.m4a
-sample.midi
-sample.wav
-sample_3GPP2.3g2
-sample_iPod.m4v
-sample_iTunes.mov
-sample_mpeg2.m2v
-sample_mpeg4.mp4
-violin07.aif
-violin12.aif
-zips
+LICENSE
+README.md
+cache.go
+cache_test.go
+exports.go
+swift

local as the base, remote as the other

$ drive diff --base-local ls.txt 
File: /diff-test/ls.txt
* local:          2015-11-26T17:32:49.000Z                
* remote:         2015-11-26T17:32:09.000Z                
ls.txt
****

--- /Users/emmanuelodeke/emm.odeke@gmail.com/diff-test/ls.txt   2015-11-26 10:32:49.000000000 -0700
+++ .xtmp5577006791947779410.tmp658721850   2015-11-29 20:11:22.000000000 -0700
@@ -1,6 +1,15 @@
-LICENSE
-README.md
-cache.go
-cache_test.go
-exports.go
-swift
+02 Downtown (feat. Kidd Kidd).m4a
+About_A_Girl.mp3
+drop.avi
+sample.3gp
+sample.m4a
+sample.midi
+sample.wav
+sample_3GPP2.3g2
+sample_iPod.m4v
+sample_iTunes.mov
+sample_mpeg2.m2v
+sample_mpeg4.mp4
+violin07.aif
+violin12.aif
+zips
diff: allow base switching between local or remote
Fixes #506

Allows users to switch decide if local
is the base otherwise use remote.

@odeke-em odeke-em merged commit 3e86922 into master Nov 30, 2015

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@odeke-em odeke-em deleted the diff-base-switch branch Feb 4, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.