[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

checkout -r dst -j src fyle

Subject: checkout -r dst -j src fyle
Date: Thu, 12 Dec 2002 16:21:59 -0500 (EST)

I'm writing a script to merge files from one branch (src) to another (dst).  If
a file has  never been merged between the two, then the command "checkout -r
dst -j src fyle" should checkout the file on the dst branch and then merge the
changes from the tip of the src branch into it.

If this merge has to be repeated, because of new work on the src branch, the
command "checkout -r dst -j OLDM -j src fyle", where OLDM was src branch tip
when the previous merge was done, would do the subsequent merge.

But if I don't want to do this per file and want to work on a whole repository,
I have to use the -j -j format for the files that don't have a label, yet.

If I put the label on the "common ancestor" version, will it work?
If there is no common ancestor, should I use verison

reply via email to

[Prev in Thread] Current Thread [Next in Thread]