[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Tree Conflict dialog, showing wrong 'branch log'?

From: Greg Creager <greg.creager_at_hp.com>
Date: Thu, 8 Dec 2011 08:00:14 -0800 (PST)

I am testing out a workflow and seeing an odd behavior, perhaps this is working as intended, but does not seem helpful.

Setup consists of:
- featA branch
- featB branch
- feat_int branch (for integrating features before they go to trunk

1) trunkfile.txt is added to trunk
2) merge trunk to featA gets trunkfile.txt into FeatA (updating from main development)
3) merge trunk to featB gets trunkfile.txt into FeatB (updating from main development)
4) featB MODIFIES trunkfile.txt (this is the gotcha later)
5) featA merges to feat_int (drop to get into an integration build), this adds trunkfile.txt to feat_int
6) featB merges to feat_int for its drop
 ISSUE: Tree conflict on trunkfile.txt as it already exists on feat_int. When editing the tree conflict I get the dialog, and this is where things seem off.
  a) The source Left/Right show the correct paths of the merge
  b) The 'show log', shows the local working copy
  c) The 'show branch log' does not show the log as I would expect (and would allow me to see the change to that file), instead it shows me the log of trunk, where the file was added. Of course this is not helpful, as it does not show me what is going on in my merge source!
  d) The only option I get is to 'keep the local file', I cannot select the branch version.

So I see two issues here:
1) Merge did not account for my change in trunkfile.txt on featB, I have to do another merge on that file and ignore ancestry to get this. Of course this is not a good solution when you are dealing with hundreds of files. (I believe this is a known issue with the Subversion merge algorithm and lack of rename tracking, so we are out of luck until that is fixed)

2) In my opinion, the 'show branch log' button in the edit Tree conflict GUI should show the log of the branch you are merging from, not where the file originated


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-08 17:00:17 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.