[prev in list] [next in list] [prev in thread] [next in thread] 

List:       svk-devel
Subject:    [svk-devel]Does the smerge support inner conflict messages like update
From:       wuyuehao () gmail ! com (Tony Wu)
Date:       2007-01-31 5:02:16
Message-ID: 211709bc0701310202l7f8c1bbbt244c4d76c2191e2a () mail ! gmail ! com
[Download RAW message or body]

Hi,

for example, if conflict was found during update operation, the
conflict message will be write into the file. for example,

>>>> YOUR VERSION sandwich.txt 112646405792039
Salami
Mortadella
Prosciutto
Djon Mustard
==== ORIGINAL VERSION sandwich.txt 112646405792039
Provolone
Creole Mustard
==== THEIR VERSION sandwich.txt 112646405792039
Provolone
Sauerkraut
Grilled Chicken
Creole Mustard
<<<< 112646405792039

But I have not found a switch for smerge doing the similar things.
When I sync the code between two depots, I have to handle the merge
manually during the operation. I want to do the sync between 2 depots
automatically, is it possible for me to record the conflicts and fix
them later as the update operation does?



-- 
Tony Wu
China Software Development Lab, IBM

[prev in list] [next in list] [prev in thread] [next in thread]