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

List:       bitkeeper-users
Subject:    [Bitkeeper-users] Re: identical changes conflict
From:       Deliverable Mail <deliverable () gmail ! com>
Date:       2005-03-22 17:22:24
Message-ID: 7c737f300503220922a839bbb () mail ! gmail ! com
[Download RAW message or body]

So far, I've found a simple way to prevent the conflict: since my
original repo has a checkout:edit mode, I have to say, after
anexternal identical change on a file, but before bk pull: bk unedit
file, and then bk pull from the repo with the same identical update. 
So, if the identical change is done by an external SCM, I can have a
list of files that were identically modified, i.e. not in fact
modified but just touched, and run xargs bk unedit on them prior to bk
pull.  I wonder whether this is the only/simplest way to prevent the
identical changes conflict?

Cheers,
Alexy
_______________________________________________
Bitkeeper-users mailing list
Bitkeeper-users@bitmover.com
http://mail.bitmover.com/mailman/listinfo/bitkeeper-users
[prev in list] [next in list] [prev in thread] [next in thread]