Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:23:02 -0700] rev 2823
test-fetch: make output stable
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:09:26 -0700] rev 2822
fetch: fix breakage from mpm.
add test so will not break again.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 21:42:50 -0700] rev 2821
mq: new commands qselect, qguard
implement quilt-style guards for mq.
guards allow to control whether patch can be pushed.
if guard X is active and patch is guarded by +X (called "posative guard"),
patch can be pushed. if patch is guarded by -X (called "nagative guard"),
patch cannot be pushed and is skipped.
use qguard to set/list guards on patches. use qselect to set/list
active guards.
also "qseries -v" prints guarded patches with "G" now.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 18:14:03 -0700] rev 2820
fix permission of test-mq-qsave
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 18:12:48 -0700] rev 2819
mq: add join method
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:59:32 -0700] rev 2818
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:48:24 -0700] rev 2817
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:48:18 -0700] rev 2816
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 10:56:48 -0500] rev 2815
Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 10:35:19 -0500] rev 2814
Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:26:00 -0500] rev 2813
Merge: refactor err and failedmerge -> unresolved
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:19:20 -0500] rev 2812
Refactor update locking slightly
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:11:16 -0500] rev 2811
Merge: combine choose and moddirstate to partial
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:53:04 -0500] rev 2810
Rename merge.allow -> merge.branchmerge
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:18:16 -0500] rev 2809
Use demandload @ syntax
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 22:54:33 -0500] rev 2808
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 22:35:36 -0500] rev 2807
Teach demandload how to import as
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 20:54:03 -0500] rev 2806
Factor doupdate into _lookup + hg.update
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 17:26:09 -0500] rev 2805
Fix extensions for merge change
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:12:03 -0700] rev 2804
Update mq to use new logmessage arglist from 2794:
bd8a9a94139f
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 16:47:06 -0500] rev 2803
Merge with crew
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 19:08:55 -0700] rev 2802
fetch: add missing import.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:33:14 -0700] rev 2801
fetch: do not fetch if working dir modified
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:27:38 -0700] rev 2800
new extension: fetch -> combine pull and merge/update
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.
this makes useful command like git 'pull' command.