This mail is an automated notification from the bugs tracker of the project: xtla.el.
/**************************************************************************/ [bugs #840] Full Item Snapshot: URL: <http://gna.org/bugs/?func=detailitem&item_id=840> Project: xtla.el Submitted by: Matthieu MOY On: Sun 10/03/2004 at 23:37 Category: xtla.el Priority: 3 - Low Resolution: None Assigned to: None Originator Email: Status: Open Planned Release: 1.1 Type of request: big feature Fixed Release: Test case in xtla-tests.el: Summary: A way to identify mixed edit/merge changesets Original Submission: That could be interesting to have a feature in xtla that would allow the user to separate the "merge" part and the "edit" part of a changeset. Example of senario: * Mr X does some manual editions in his tree, * He merges from Mr Y, * He commits. (patch XXX--patch-N) Now, Mr Z comes in the picture, runs tla-missing, sees Mr X's patch, and wonders whether this is a mixed changeset. Solution: The xtla command should (tla-get (tla-ancestor XXX--patch-N)) in local tree /path/to/tree. Then, it would replay the patches contained in XXX--patch-N (the difficulty here being: which patch to apply first ?) Then, the "edition" part is just the result of tla changes --dir /path/to/tree XXX--patch-N For detailed info, follow this link: <http://gna.org/bugs/?func=detailitem&item_id=840> _______________________________________________ Message sent via/by Gna! http://gna.org/
