[Top][All Lists]

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

RE: Merging from main to branch.

From: Jim.Hyslop
Subject: RE: Merging from main to branch.
Date: Thu, 22 Apr 2004 09:07:26 -0400

address@hidden wrote:
> The problem is that you're tagging the wrong things.  "merge-from"
> should be the revision (on the trunk) just before the changes you want
> to merge and "merge-to" should be the revision (also on the trunk) the
> contains all of the changes to be merged.

The way I remember this, is that the update "-jA -jB" says "Take the
difference between rev A and rev B, and apply it to my current working

Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (
Columnist, C/C++ Users Journal (

reply via email to

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