[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Best way to handle this kind of file splitting across a branc h merg
RE: Best way to handle this kind of file splitting across a branc h merge?
Thu, 22 Apr 2004 09:13:30 -0400
Doug Lee wrote:
> I know this is obnoxious, but here's where I am: I have a trunk
> with one branch, after which on the trunk, one file splits into
> about five files. Development of course continued in those five
> files, but suddenly there arose a need to port selected changes
> from that development back to before the split.
> So my question, more than how to get out of my current pickle, is how
> to handle such pickles in general, including what preparations,
> add-ons, etc., to use.
I'm not aware of any add-ons that would help in this case (but that doesn't
mean much :-). As far as I can tell, the only way to handle this is
manually, because so much of it will depend on human analysis of the meaning
of each change.
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)
|[Prev in Thread]
||[Next in Thread]|
- RE: Best way to handle this kind of file splitting across a branc h merge?,