• Sriram Karra's avatar
    Allow --conflict-resolve to be set as 1 or 2 · 72d4dce7
    Sriram Karra authored
    Earlier the argument only used to be the dbid - and as we did not allow
    same-to-same synching, it was fine. With the present refactoring
    we need to uniquely identify which of the two they are referring to.
    
    With this commit we seamlessly migrate the identification of cr
    flag from dbid to either 1 or 2. Existing state.json files will
    work seamlessly as none of them would have issues with teh dbid
    specification. Newly created profiles - whether same to same or
    unique dbid syncs will all use 1 or 2 to specify the direction of
    conflict resolution
    72d4dce7
Name
Last commit
Last update
.stash Loading commit data...
asynk Loading commit data...
config Loading commit data...
doc Loading commit data...
gae Loading commit data...
lib Loading commit data...
scripts Loading commit data...
test Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
README.org Loading commit data...
asynk.py Loading commit data...
asynk_cmdline.py Loading commit data...
asynk_core.py Loading commit data...
asynk_logger.py Loading commit data...
gout.spec Loading commit data...
requirements.txt Loading commit data...
setup.py Loading commit data...
state.init.json Loading commit data...
state_collection.py Loading commit data...