Message-ID: <41FFE752.9040908@panoramicfeedback.com>
Date: Tue, 01 Feb 2005 15:32:18 -0500
From: Aaron Bentley <abentley@panoramicfeedback.com>
User-Agent: Mozilla Thunderbird 0.6 (X11/20040530)
MIME-Version: 1.0
To: Jan Hudec <bulb@ucw.cz>
Subject: Re: [Gnu-arch-users] Partial update
References: <41FFD773.1040905@cfconsulting.ca>
	<20050201200518.GA21747@vagabond>
In-Reply-To: <20050201200518.GA21747@vagabond>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: gnu-arch-users@gnu.org, Colin Fox <cfox@cfconsulting.ca>
Precedence: list
Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Status: RO
Content-Length: 786
Lines: 30
Jan Hudec wrote:

>> star-merge is superset of update.

I used to think so, but it's not accurate when you look at trees that 
have deliberately diverged.  Star-merge will throw away local changes 
that were rejected by the other branch, and merge the two as closely as 
possible.

Update, on the other hand, will retain local changes, and apply any 
changes from the other tree since the last merge from other.

This is why Fai supports "merge --update".  It also supports "merge 
--update --diff3".

Aaron

-- 
Aaron Bentley
Director of Technology
Panometrics, Inc.


_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users@gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/