Adrian Buehlmann wrote: > On 09.05.2010 13:39, Neal Becker wrote: >> I have a series of (in this case consecutive) patches I'd like to >> collapse >> into a single changeset. These are already committed and not tip. Any >> ideas? > > I usually fold patches using the patch queue in hgtk log > > http://tortoisehg.bitbucket.org/manual/1.0/patches.html#patch-queues > > Enable the mq extension [1], import the patches into the queue using the > context menu of the log viewer, then unapply the patch you want to fold > and then select "Fold" from the context menu of the patch. > > http://bitbucket.org/abuehl/downloads/downloads/folding-a-patch-in-hgtk- log.PNG > > [1] http://mercurial.selenic.com/wiki/MqExtension > > >
Unfortunately, I got stuck on step 1 - import patches to queue. I get: abort: revision 7 is the root of more than one branch I'm trying to combine changesets 7,8,9. @ changeset: 19:c26f4fd7f872 | tag: tip | user: [email protected] | date: Fri May 07 20:28:46 2010 -0400 | summary: Fix throw_exception.hpp | o changeset: 18:547ea1f75944 | user: [email protected] | date: Wed May 05 20:24:10 2010 -0400 | summary: Added tag 1_43_0.hg for changeset ea7fe5ec4a35 | o changeset: 17:ea7fe5ec4a35 |\ tag: 1_43_0.hg | | parent: 2:9f6bc3465b4f | | parent: 14:95ec21298abd | | user: [email protected] | | date: Wed May 05 20:23:14 2010 -0400 | | summary: Merge | | | | o changeset: 16:861f5b5ede81 | | |\ parent: 15:0c84201fc3ba | | | | parent: 1:b816579cd3f6 | | | | user: [email protected] | | | | date: Wed Feb 24 19:51:25 2010 -0500 | | | | summary: merge 1_42_0 | | | | | +---o changeset: 15:0c84201fc3ba | | | user: [email protected] | | | date: Wed Feb 24 19:50:18 2010 -0500 | | | summary: Add range_ex | | | | o | changeset: 14:95ec21298abd | | | user: [email protected] | | | date: Fri Jan 15 08:23:12 2010 -0500 | | | summary: Fix boost/python/module_init.hpp to use expand macros | | | | o | changeset: 13:be235100b4cc | | | user: [email protected] | | | date: Wed Nov 25 07:57:31 2009 -0500 | | | summary: Added tag 1.41.0.nb for changeset f6649027dc90 | | | | o | changeset: 12:f6649027dc90 | | | tag: 1.41.0.nb | | | user: [email protected] | | | date: Wed Nov 25 07:56:19 2009 -0500 | | | summary: Added tag 1.41.0 for changeset c6dde043ee33 | | | | o | changeset: 11:70b783cdd2ff | | | user: [email protected] | | | date: Wed Nov 18 18:45:22 2009 -0500 | | | summary: elide trivial constructors | | | | o | changeset: 10:db74299e0928 | | | user: [email protected] | | | date: Wed Nov 18 18:44:51 2009 -0500 | | | summary: constrained_value | | | | o | changeset: 9:991ed1eb747e | | | user: [email protected] | | | date: Sun Oct 18 11:21:27 2009 -0400 | | | summary: better mixed complex arith | | | | o | changeset: 8:917ad0b13fe1 | | | user: [email protected] | | | date: Tue Sep 29 15:01:07 2009 -0400 | | | summary: mixed complex arith | | | | o | changeset: 7:66a3746677c9 | | | user: [email protected] | | | date: Wed Nov 18 18:44:00 2009 -0500 | | | summary: various ublas | | | | o | changeset: 6:f7792ddb7e5b | | | user: [email protected] | | | date: Wed Nov 18 18:43:45 2009 -0500 | | | summary: mersenne | | | | o | changeset: 5:ce46c288b5d5 | | | user: [email protected] | | | date: Wed Nov 18 18:43:32 2009 -0500 | | | summary: user-config.jam | | | | o | changeset: 4:9a79c7174b9f | | | user: [email protected] | | | date: Wed Nov 18 18:43:06 2009 -0500 | | | summary: add BUILD | | | | o | changeset: 3:aa9643cd288d | | | parent: 0:c6dde043ee33 | | | user: [email protected] | | | date: Wed Nov 18 18:42:51 2009 -0500 | | | summary: add .hgignore | | | o---+ changeset: 2:9f6bc3465b4f | | user: [email protected] / / date: Wed May 05 17:07:06 2010 -0400 | | summary: update to 1.43.0 | | | o changeset: 1:b816579cd3f6 |/ user: [email protected] | date: Wed Feb 24 19:41:40 2010 -0500 | summary: update to 1.42.0 | o changeset: 0:c6dde043ee33 tag: 1.41.0 user: [email protected] date: Wed Nov 18 18:41:53 2009 -0500 summary: init 1.41.0 ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
