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

Error: difference in snaps for path #11

Open
ceremcem opened this issue May 11, 2014 · 7 comments
Open

Error: difference in snaps for path #11

ceremcem opened this issue May 11, 2014 · 7 comments

Comments

@ceremcem
Copy link

What should I understand from that error message:

Loading filelists...
Error: difference in snaps for path: bin/firefox.d
@ceremcem
Copy link
Author

...and I can not find a workaround...

ceremcem@cca-erik:~$ bsync ./-.-\ cca-home/ /media/ceremcem/zfs_zencefil/-.-\ cca-home/
Loading filelists...
Error: difference in snaps for path: bin/firefox.d
ceremcem@cca-erik:~$ find ./-.-\ cca-home/ -iname "firefox.d"
ceremcem@cca-erik:~$ 

@dooblem
Copy link
Owner

dooblem commented May 11, 2014

Hi ceremcem,
Can you try bsync branch I suggested you in #7 ?

You can also delete all .bsync-snap-* files, but you will loose previous history.

You may run bsync with -v (verbose) to get the .bsync-snap filenames.

This is strange, it's like the firefox.d has been deleted while bsync was making the snapshots.

@dooblem
Copy link
Owner

dooblem commented May 11, 2014

After running bsync with -v, you may send me the 2 .bsync-snap files from the 2 directories. I'll take a look at it.

@ceremcem
Copy link
Author

No no, sorry, I should say that I manually deleted firefox.d in order to get a workaround.

@dooblem
Copy link
Owner

dooblem commented May 31, 2014

Let me know if you tested my new branch...

@Busyvar
Copy link

Busyvar commented Jul 11, 2015

I have the same issue. What should i do?

@erikmd
Copy link

erikmd commented Aug 31, 2015

Hello @dooblem,

I also experienced this kind of issue, not with firefox.d but with the .bash_history file, probably because I was using another terminal during the sync... See below for a summary of bsync output.

I followed your suggestion in #7 (comment) and tested the code of your nostrict branch.

Apparently this seemed to solve the issue (without needing to remove the .bsync-snap-* files) and I was also asked what to do with the problematic file (just like a regular bsync conflict).

So I believe that this code would deserve to be merged into master (either directly or behind a command-line option such as -f or -k ...)

Best regards.

~$ ~/forge/git-anon/bsync/bsync ~/ [SERVER]:[DIRECTORY]
Loading filelists...
Error: difference in snaps for path: .bash_history
~$ cd ~/forge/git-anon/bsync/
~/forge/git-anon/bsync$ git checkout nostrict
Branch nostrict set up to track remote branch nostrict from origin.
Switched to a new branch 'nostrict'
~/forge/git-anon/bsync$ cd
~$ ~/forge/git-anon/bsync/bsync ~/ [SERVER]:[DIRECTORY]
Warning: difference in snaps, ignoring history for path: .bash_history
Loading filelists...

CONFLICT detected on: .bash_history
LEFT DIR CHANGE                                   RIGHT DIR CHANGE
12967B (2015-08-31 00:28:47)                      10778B (2015-08-30 21:34:03)

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
CONFLICT detected on: .bash_history
LEFT DIR CHANGE                                   RIGHT DIR CHANGE
12967B (2015-08-31 00:28:47)                      10778B (2015-08-30 21:34:03)

Which one do I keep? [1/2/1a/2a/Quit/Help] 1
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

(LEFT DIR CONTENT)                                (RIGHT DIR CONTENT)             (ACTION)

[...]

Todo in [HOME]: sync:1
Todo in [SERVER]:[DIRECTORY]: mv:1 rm:2 cp:10 sync:33
Apply actions? [y/N] y

Applying actions...
Updating filelists...
Done!
~$ echo $?
0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants