Announcement

Collapse
No announcement yet.

Ability to launch merge from folder sync

Collapse
X
 
  • Filter
  • Time
  • Show
Clear All
new posts

  • Ability to launch merge from folder sync

    Folder Sync is really good for single-user development and where a particular file is only changed on either the left or right side.
    If changes can be made to a common file then care must be taken NOT to default to compare timestamps as 1 side will always be later than the other when shared files are changed - you must use content compare otherwise 1 side can loose their changes.

    So, by setting the rules as content compare, you need to do a folder synch first, and then a folder compare to process the remaining different files.
    However, even that is no good as content compare always ends up with nothing to sync as the sync is ONLY time-based.

    What I would liketo see is the ability to diff or merge available in the drop-down of the 'if files are different' in the folder sync settings.
    Or the ability to display them but not synchronise them.

    You can use the Peek facility, and compare the file from there, but not merge it. You also cannot filter the peek window to only show differences.

    Advanced wish 3-way synch (which would help resolving files changed on both sides problem) - the ability to specify an ancester folder as well as the left and right, so that BC3 can know what has been changed on both sides, irrespective of timestamps, and will then automatically know which changes to copy left, which to copy right, and which need resolution. Double-clicking on an unresolved file would launch the 3-way merge (result of merge depends on sync target - update both, update left, etc.)

    Certainly such a powerful tool could well sway a company-wide update to BC3 from BC2, based on simple cost-saving on this activity alone.

  • #2
    Originally posted by Glyn Williams View Post
    If changes can be made to a common file then care must be taken NOT to default to compare timestamps...you must use content compare otherwise 1 side can loose their changes.
    Change the default comparison method to be based on content, not on timestamps. That's how I've configured BC3. You can also start a sync session from a folder compare session if you want more control over how you first set things up.

    Originally posted by Glyn Williams View Post
    Advanced wish 3-way synch (which would help resolving files changed on both sides problem) - the ability to specify an ancester folder as well as the left and right
    BC3 Professional edition already supports 3-way file merge. Standard edition does not. I believe that a 3-way folder merge is being considred for a future release.
    BC v4.0.7 build 19761
    ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ

    Comment


    • #3
      Hello,

      In addition to Michael's comments, you can open a new Folder Sync session, go to the Session Settings, Sync tab, and configure a Custom sync that only effects Different and Orphans. Then go to the Comparison tab and turn on a Content Comparison, and turn off timestamps.
      Aaron P Scooter Software

      Comment

      Working...
      X