[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: complex patch/diff usage
|
From: |
Paul Jarc |
|
Subject: |
Re: complex patch/diff usage |
|
Date: |
Thu, 29 Jul 2004 00:46:26 -0400 |
|
User-agent: |
Gnus/5.110003 (No Gnus v0.3) Emacs/21.3 (gnu/linux) |
ianstevenson@hotmail.com (Ian Stevenson) wrote:
> A
> / \
> A1 A2
> | | x
> A11 A22
>
> The x marks the changes that we want to go into A11.
Create a diff between A2 and A22. Then apply that patch to A11.
> To further help you understand this, think of CVS branches - as that's
> how this came about.
Other version control systems (say, Arch) would make it easier to
handle this situation.
paul