RE: [Gnu-arch-users] Descending from multiple trees

[Parker, Ron]

> From: Jacob Gorm Hansen [mailto:address@hidden
> Sent: Tuesday, March 09, 2004 11:12 AM

> Now I can retrieve all my changes to unstable--1.3 like this:
> 
> tla changes --diffs xen--migration--1.3--patch-8 >somefile
> 
> And use patch to merge them into xen--migration--1.2. But if 
> I do this,
> I loose information about where these changes came from, making the
> eventual merge back into xen--unstable--1.3 harder.

I'm no expert, but I think a "tla undo" or "Tla mkpatch" could be used in
this situation to store the changes from your 1.3 work and either "tla redo"
or "tla dopatch" could then be used to pull the generated changeset into
your 1.2 line.  I do not know if either of these solutions will preserve
your change history.