Error: difference in snaps for path about bsync

[ceremcem]

...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]

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]

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]

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

[dooblem]

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

[Busyvar]

I have the same issue. What should i do?

[erikmd]

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