Re: [Monotone-devel] monotone update overwrites local changes

[Emile Snyder]

See tests/t_add_stomp_file.at ;)

-emile

On Tue, 2005-05-10 at 10:52, Robert Bihlmeyer wrote:
> Suppose I have two working copies A and B, and an unknown file F in
> both. I then add A/F, commit this, and finally update B. monotone will
> trample over the contents of B/F overwriting it with the version
> committed from A/F. I don't think that's sensible behaviour, as update
> should not be a destructive operation.
> 
> One option is to punt like CVS does and refuse to update unless B/F is
> moved away. More useful would be to initiate a two-way-merge between
> the repository version and what's already there. The latter is already
> done when I do "monotone add B/F" before updating. (A middle-of-the-
> road solution would be to punt with a reminder that one can either
> move F away or add it to get merging behaviour.)

+----------------------------------------------------------------------
"The Two Phases Of University Employment: 1. Doesn't know enough to get
a Real Job. 2. Knows too much to want a Real Job." -- sharks 
+----------------------------------------------------------------------

signature.asc
Description: This is a digitally signed message part