Re: Question about merging

On Sep 17, 2010, at 12:38 PM, Bob Archer wrote:
> It is updating/writing merge info on those child nodes. There must have been a merge that was done at a level lower than the root folder of your project which put merge info on those files but not on the parent root folder.

A more concrete example:

hexley-wl:~ khym$ svn co https://my.repo/svn/branches/dave-calendar72
[ ... ]
hexley-wl:~ khym$ cd dave-calendar72
hexley-wl:dave-calendar72 khym$ svn merge --accept postpone https://my.repo/svn/branches/7.1@28161 https://my.repo/svn/branches/dave-calendar71
--- Merging differences between repository URLs into '.':
[ ... ]
U LoadDB/LoadDB.cpp
[ ... ]
C Reports/Invoice.rpt
[ ... ]
Summary of conflicts:
  Text conflicts: 491
  Tree conflicts: 5

# So, a .cpp was supposedly updated, and an .rpt was supposedly conflicted
hexley-wl:dave-calendar72 khym$ svn proplist https://my.repo/svn/branches/7.1/LoadDB/LoadDB.cpp@28161 https://my.repo/svn/branches/dave-calendar71/LoadDB/LoadDB.cpp LoadDB/LoadDB.cpp
Properties on 'https://my.repo/svn/branches/7.1/LoadDB/LoadDB.cpp':
  svn:keywords
Properties on 'https://my.repo/svn/branches/dave-calendar71/LoadDB/LoadDB.cpp':
  svn:keywords
Properties on 'LoadDB/LoadDB.cpp':
  svn:keywords

# No mergeinfo on that file, in any of the places that are involved in the merge. Doing the same thing for Invoice.rpt shows that the only property is svn:mime-type.

hexley-wl:dave-calendar72 khym$ svn diff https://my.repo/svn/branches/7.1/LoadDB/LoadDB.cpp@28161 https://my.repo/svn/branches/dave-calendar71/LoadDB/LoadDB.cpp
hexley-wl:dave-calendar72 khym$ svn diff https://my.repo/svn/branches/7.1/Reports/Invoice.rpt@28161 https://my.repo/svn/branches/dave-calendar71/Reports/Invoice.rpt

# And svn diff shows that there are neither any text differences or property differences.

hexley-wl:dave-calendar72 khym$ svn stat LoadDB/LoadDB.cpp Reports/Invoice.rpt
C Reports/Invoice.rpt

# Finally, svn stat shows that there are no modifications to my WC's LoadDB.cpp, despite the merge supposedly updating it. However, Invoice.rpt really is conflicted.
Received on 2010-09-17 21:08:18 CEST