mercurial: tests/test-record.out@c00f03a4982e (annotated)

5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1	% help
5040 4f34d9b2568e Update style of record's cmdtable to match mercurial/commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 5037 diff changeset	2	hg record [OPTION]... [FILE]...
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	4	interactively select changes to commit
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	5
9074 b4f259c1667a record: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8938 diff changeset	6	If a list of files is omitted, all changes reported by "hg status" will be
b4f259c1667a record: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8938 diff changeset	7	candidates for recording.
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	8
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10964 diff changeset	9	See "hg help dates" for a list of formats valid for -d/--date.
6163 1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 5863 diff changeset	10
9074 b4f259c1667a record: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8938 diff changeset	11	You will be prompted for whether to record changes to each modified file,
b4f259c1667a record: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8938 diff changeset	12	and for files with multiple changes, for each change to use. For each
b4f259c1667a record: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8938 diff changeset	13	query, the following responses are possible:
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	14
9291 cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9074 diff changeset	15	y - record this change
cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9074 diff changeset	16	n - skip this change
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	17
9291 cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9074 diff changeset	18	s - skip remaining changes to this file
cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9074 diff changeset	19	f - record remaining changes to this file
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	20
9291 cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9074 diff changeset	21	d - done, skip remaining changes and files
cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9074 diff changeset	22	a - record all changes to all remaining files
cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9074 diff changeset	23	q - quit, recording no changes
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	24
9291 cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9074 diff changeset	25	? - display help
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	26
11237 feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	27	This command is not available when committing a merge.
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	28
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	29	options:
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	30
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	31	-A --addremove mark new/missing files as added/removed before
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	32	committing
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	33	--close-branch mark a branch as closed, hiding it from the branch
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	34	list
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	35	-I --include PATTERN [+] include names matching the given patterns
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	36	-X --exclude PATTERN [+] exclude names matching the given patterns
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	37	-m --message TEXT use text as commit message
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	38	-l --logfile FILE read commit message from file
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	39	-d --date DATE record datecode as commit date
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	40	-u --user USER record the specified user as committer
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	41
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11238 diff changeset	42	[+] marked option can be specified multiple times
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	43
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	44	use "hg -v help record" to show global options
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	45	% select no files
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	46	diff --git a/empty-rw b/empty-rw
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	47	new file mode 100644
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	48	examine changes to 'empty-rw'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	49	no changes to record
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	50
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	51	changeset: -1:000000000000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	52	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	53	user:
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	54	date: Thu Jan 01 00:00:00 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	55
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	56
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	57	% select files but no hunks
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	58	diff --git a/empty-rw b/empty-rw
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	59	new file mode 100644
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	60	examine changes to 'empty-rw'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	61	abort: empty commit message
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	62
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	63	changeset: -1:000000000000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	64	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	65	user:
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	66	date: Thu Jan 01 00:00:00 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	67
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	68
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	69	% record empty file
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	70	diff --git a/empty-rw b/empty-rw
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	71	new file mode 100644
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	72	examine changes to 'empty-rw'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	73
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	74	changeset: 0:c0708cf4e46e
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	75	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	76	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	77	date: Thu Jan 01 00:00:00 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	78	summary: empty
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	79
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	80
10964 aa0426c79664 test-record: add hg summary to verify we update dirstate Augie Fackler <durin42@gmail.com> parents: 10694 diff changeset	81	% summary shows we updated to the new cset
aa0426c79664 test-record: add hg summary to verify we update dirstate Augie Fackler <durin42@gmail.com> parents: 10694 diff changeset	82	parent: 0:c0708cf4e46e tip
aa0426c79664 test-record: add hg summary to verify we update dirstate Augie Fackler <durin42@gmail.com> parents: 10694 diff changeset	83	empty
aa0426c79664 test-record: add hg summary to verify we update dirstate Augie Fackler <durin42@gmail.com> parents: 10694 diff changeset	84	branch: default
aa0426c79664 test-record: add hg summary to verify we update dirstate Augie Fackler <durin42@gmail.com> parents: 10694 diff changeset	85	commit: (clean)
aa0426c79664 test-record: add hg summary to verify we update dirstate Augie Fackler <durin42@gmail.com> parents: 10694 diff changeset	86	update: (current)
aa0426c79664 test-record: add hg summary to verify we update dirstate Augie Fackler <durin42@gmail.com> parents: 10694 diff changeset	87
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	88	% rename empty file
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	89	diff --git a/empty-rw b/empty-rename
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	90	rename from empty-rw
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	91	rename to empty-rename
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	92	examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	93
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	94	changeset: 1:d695e8dcb197
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	95	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	96	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	97	date: Thu Jan 01 00:00:01 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	98	summary: rename
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	99
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	100
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	101	% copy empty file
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	102	diff --git a/empty-rename b/empty-copy
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	103	copy from empty-rename
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	104	copy to empty-copy
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	105	examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	106
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	107	changeset: 2:1d4b90bea524
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	108	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	109	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	110	date: Thu Jan 01 00:00:02 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	111	summary: copy
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	112
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	113
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	114	% delete empty file
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	115	diff --git a/empty-copy b/empty-copy
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	116	deleted file mode 100644
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	117	examine changes to 'empty-copy'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	118
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	119	changeset: 3:b39a238f01a1
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	120	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	121	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	122	date: Thu Jan 01 00:00:03 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	123	summary: delete
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	124
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	125
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	126	% add binary file
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5757 diff changeset	127	1 changesets found
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	128	diff --git a/tip.bundle b/tip.bundle
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	129	new file mode 100644
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	130	this is a binary file
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	131	examine changes to 'tip.bundle'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	132
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	133	changeset: 4:ad816da3711e
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	134	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	135	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	136	date: Thu Jan 01 00:00:04 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	137	summary: binary
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	138
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	139	diff -r b39a238f01a1 -r ad816da3711e tip.bundle
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	140	Binary file tip.bundle has changed
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	141
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	142	% change binary file
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5757 diff changeset	143	1 changesets found
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	144	diff --git a/tip.bundle b/tip.bundle
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	145	this modifies a binary file (all or nothing)
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	146	examine changes to 'tip.bundle'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	147
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	148	changeset: 5:dccd6f3eb485
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	149	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	150	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	151	date: Thu Jan 01 00:00:05 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	152	summary: binary-change
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	153
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	154	diff -r ad816da3711e -r dccd6f3eb485 tip.bundle
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	155	Binary file tip.bundle has changed
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	156
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	157	% rename and change binary file
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5757 diff changeset	158	1 changesets found
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	159	diff --git a/tip.bundle b/top.bundle
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	160	rename from tip.bundle
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	161	rename to top.bundle
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	162	this modifies a binary file (all or nothing)
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	163	examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	164
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	165	changeset: 6:7fa44105f5b3
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	166	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	167	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	168	date: Thu Jan 01 00:00:06 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	169	summary: binary-change-rename
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	170
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	171	diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	172	Binary file tip.bundle has changed
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	173	diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	174	Binary file top.bundle has changed
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	175
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	176	% add plain file
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	177	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	178	new file mode 100644
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	179	examine changes to 'plain'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	180
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	181	changeset: 7:11fb457c1be4
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	182	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	183	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	184	date: Thu Jan 01 00:00:07 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	185	summary: plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	186
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	187	diff -r 7fa44105f5b3 -r 11fb457c1be4 plain
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	188	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	189	+++ b/plain Thu Jan 01 00:00:07 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	190	@@ -0,0 +1,10 @@
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	191	+1
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	192	+2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	193	+3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	194	+4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	195	+5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	196	+6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	197	+7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	198	+8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	199	+9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	200	+10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	201
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	202	% modify end of plain file
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	203	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	204	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	205	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	206	@@ -8,3 +8,4 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	207	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	208	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	209	10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	210	+11
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	211	record this change to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	212	% modify end of plain file, no EOL
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	213	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	214	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	215	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	216	@@ -9,3 +9,4 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	217	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	218	10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	219	11
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	220	+7264f99c5f5ff3261504828afa4fb4d406c3af54
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	221	\ No newline at end of file
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	222	record this change to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	223	% modify end of plain file, add EOL
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	224	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	225	1 hunks, 2 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	226	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	227	@@ -9,4 +9,4 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	228	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	229	10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	230	11
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	231	-7264f99c5f5ff3261504828afa4fb4d406c3af54
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	232	\ No newline at end of file
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	233	+7264f99c5f5ff3261504828afa4fb4d406c3af54
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	234	record this change to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	235	% modify beginning, trim end, record both
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	236	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	237	2 hunks, 4 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	238	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	239	@@ -1,4 +1,4 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	240	-1
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	241	+2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	242	2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	243	3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	244	4
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	245	record change 1/2 to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	246	@@ -8,5 +8,3 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	247	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	248	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	249	10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	250	-11
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	251	-7264f99c5f5ff3261504828afa4fb4d406c3af54
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	252	record change 2/2 to 'plain'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	253
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	254	changeset: 11:efca65c9b09e
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	255	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	256	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	257	date: Thu Jan 01 00:00:10 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	258	summary: begin-and-end
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	259
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	260	diff -r cd07d48e8cbe -r efca65c9b09e plain
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	261	--- a/plain Thu Jan 01 00:00:10 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	262	+++ b/plain Thu Jan 01 00:00:10 1970 +0000
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	263	@@ -1,4 +1,4 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	264	-1
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	265	+2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	266	2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	267	3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	268	4
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	269	@@ -8,5 +8,3 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	270	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	271	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	272	10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	273	-11
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	274	-7264f99c5f5ff3261504828afa4fb4d406c3af54
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	275
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	276	% trim beginning, modify end
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	277	% record end
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	278	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	279	2 hunks, 5 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	280	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	281	@@ -1,9 +1,6 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	282	-2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	283	-2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	284	-3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	285	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	286	5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	287	6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	288	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	289	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	290	9
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	291	record change 1/2 to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	292	@@ -4,7 +1,7 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	293	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	294	5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	295	6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	296	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	297	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	298	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	299	-10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	300	+10.new
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	301	record change 2/2 to 'plain'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	302
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	303	changeset: 12:7d1e66983c15
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	304	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	305	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	306	date: Thu Jan 01 00:00:11 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	307	summary: end-only
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	308
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	309	diff -r efca65c9b09e -r 7d1e66983c15 plain
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	310	--- a/plain Thu Jan 01 00:00:10 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	311	+++ b/plain Thu Jan 01 00:00:11 1970 +0000
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	312	@@ -7,4 +7,4 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	313	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	314	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	315	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	316	-10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	317	+10.new
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	318
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	319	% record beginning
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	320	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	321	1 hunks, 3 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	322	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	323	@@ -1,6 +1,3 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	324	-2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	325	-2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	326	-3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	327	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	328	5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	329	6
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	330	record this change to 'plain'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	331
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	332	changeset: 13:a09fc62a0e61
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	333	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	334	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	335	date: Thu Jan 01 00:00:12 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	336	summary: begin-only
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	337
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	338	diff -r 7d1e66983c15 -r a09fc62a0e61 plain
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	339	--- a/plain Thu Jan 01 00:00:11 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	340	+++ b/plain Thu Jan 01 00:00:12 1970 +0000
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	341	@@ -1,6 +1,3 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	342	-2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	343	-2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	344	-3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	345	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	346	5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	347	6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	348
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	349	% add to beginning, trim from end
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	350	% record end
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	351	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	352	2 hunks, 4 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	353	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	354	@@ -1,6 +1,9 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	355	+1
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	356	+2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	357	+3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	358	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	359	5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	360	6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	361	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	362	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	363	9
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	364	record change 1/2 to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	365	@@ -1,7 +4,6 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	366	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	367	5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	368	6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	369	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	370	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	371	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	372	-10.new
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	373	record change 2/2 to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	374	% add to beginning, middle, end
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	375	% record beginning, middle
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	376	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	377	3 hunks, 7 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	378	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	379	@@ -1,2 +1,5 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	380	+1
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	381	+2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	382	+3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	383	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	384	5
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	385	record change 1/3 to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	386	@@ -1,6 +4,8 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	387	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	388	5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	389	+5.new
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	390	+5.reallynew
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	391	6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	392	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	393	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	394	9
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	395	record change 2/3 to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	396	@@ -3,4 +8,6 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	397	6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	398	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	399	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	400	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	401	+10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	402	+11
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	403	record change 3/3 to 'plain'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	404
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	405	changeset: 15:7d137997f3a6
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	406	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	407	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	408	date: Thu Jan 01 00:00:14 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	409	summary: middle-only
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	410
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	411	diff -r c0b8e5fb0be6 -r 7d137997f3a6 plain
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	412	--- a/plain Thu Jan 01 00:00:13 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	413	+++ b/plain Thu Jan 01 00:00:14 1970 +0000
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	414	@@ -1,5 +1,10 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	415	+1
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	416	+2
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	417	+3
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	418	4
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	419	5
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	420	+5.new
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	421	+5.reallynew
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	422	6
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	423	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	424	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	425
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	426	% record end
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	427	diff --git a/plain b/plain
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	428	1 hunks, 2 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	429	examine changes to 'plain'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	430	@@ -9,3 +9,5 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	431	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	432	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	433	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	434	+10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	435	+11
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	436	record this change to 'plain'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	437
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	438	changeset: 16:4959e3ff13eb
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	439	tag: tip
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	440	user: test
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	441	date: Thu Jan 01 00:00:15 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	442	summary: end-only
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	443
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	444	diff -r 7d137997f3a6 -r 4959e3ff13eb plain
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	445	--- a/plain Thu Jan 01 00:00:14 1970 +0000
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	446	+++ b/plain Thu Jan 01 00:00:15 1970 +0000
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	447	@@ -9,3 +9,5 @@
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	448	7
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	449	8
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	450	9
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	451	+10
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	452	+11
b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	453
5128 c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	454	adding subdir/a
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	455	diff --git a/subdir/a b/subdir/a
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	456	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	457	examine changes to 'subdir/a'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	458	@@ -1,1 +1,2 @@
5128 c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	459	a
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	460	+a
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	461	record this change to 'subdir/a'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	462
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	463	changeset: 18:40698cd490b2
5128 c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	464	tag: tip
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	465	user: test
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	466	date: Thu Jan 01 00:00:16 1970 +0000
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	467	summary: subdir-change
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	468
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	469	diff -r 661eacdc08b9 -r 40698cd490b2 subdir/a
5128 c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	470	--- a/subdir/a Thu Jan 01 00:00:16 1970 +0000
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	471	+++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	472	@@ -1,1 +1,2 @@
5128 c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	473	a
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	474	+a
c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5040 diff changeset	475
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	476	% help, quit
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	477	diff --git a/subdir/f1 b/subdir/f1
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	478	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	479	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	480	y - record this change
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	481	n - skip this change
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	482	s - skip remaining changes to this file
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	483	f - record remaining changes to this file
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	484	d - done, skip remaining changes and files
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	485	a - record all changes to all remaining files
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	486	q - quit, recording no changes
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	487	? - display help
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	488	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	489	abort: user quit
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	490	% skip
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	491	diff --git a/subdir/f1 b/subdir/f1
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	492	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	493	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	494	diff --git a/subdir/f2 b/subdir/f2
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	495	1 hunks, 1 lines changed
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	496	examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	497	% no
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	498	diff --git a/subdir/f1 b/subdir/f1
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	499	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	500	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	501	diff --git a/subdir/f2 b/subdir/f2
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	502	1 hunks, 1 lines changed
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	503	examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	504	% f, quit
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	505	diff --git a/subdir/f1 b/subdir/f1
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	506	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	507	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	508	diff --git a/subdir/f2 b/subdir/f2
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	509	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	510	examine changes to 'subdir/f2'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	511	abort: user quit
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	512	% s, all
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	513	diff --git a/subdir/f1 b/subdir/f1
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	514	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	515	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	516	diff --git a/subdir/f2 b/subdir/f2
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	517	1 hunks, 1 lines changed
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	518	examine changes to 'subdir/f2'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	519
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	520	changeset: 20:d2d8c25276a8
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	521	tag: tip
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	522	user: test
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	523	date: Thu Jan 01 00:00:18 1970 +0000
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	524	summary: x
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	525
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	526	diff -r 25eb2a7694fb -r d2d8c25276a8 subdir/f2
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	527	--- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	528	+++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	529	@@ -1,1 +1,2 @@
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	530	b
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	531	+b
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	532
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	533	% f
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	534	diff --git a/subdir/f1 b/subdir/f1
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	535	1 hunks, 1 lines changed
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	536	examine changes to 'subdir/f1'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	537
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	538	changeset: 21:1013f51ce32f
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	539	tag: tip
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	540	user: test
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	541	date: Thu Jan 01 00:00:19 1970 +0000
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	542	summary: y
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	543
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	544	diff -r d2d8c25276a8 -r 1013f51ce32f subdir/f1
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	545	--- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	546	+++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5763 diff changeset	547	@@ -1,1 +1,2 @@
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	548	a
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	549	+a
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	550
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	551	% preserve chmod +x
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	552	diff --git a/subdir/f1 b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	553	old mode 100644
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	554	new mode 100755
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	555	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	556	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	557	@@ -1,2 +1,3 @@
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	558	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	559	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	560	+a
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	561	record this change to 'subdir/f1'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	562
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	563	changeset: 22:5df857735621
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	564	tag: tip
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	565	user: test
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	566	date: Thu Jan 01 00:00:20 1970 +0000
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	567	summary: z
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	568
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	569	diff --git a/subdir/f1 b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	570	old mode 100644
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	571	new mode 100755
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	572	--- a/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	573	+++ b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	574	@@ -1,2 +1,3 @@
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	575	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	576	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	577	+a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	578
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	579	% preserve execute permission on original
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	580	diff --git a/subdir/f1 b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	581	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	582	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	583	@@ -1,3 +1,4 @@
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	584	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	585	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	586	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	587	+b
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	588	record this change to 'subdir/f1'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	589
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	590	changeset: 23:a4ae36a78715
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	591	tag: tip
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	592	user: test
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	593	date: Thu Jan 01 00:00:21 1970 +0000
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	594	summary: aa
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	595
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	596	diff --git a/subdir/f1 b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	597	--- a/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	598	+++ b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	599	@@ -1,3 +1,4 @@
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	600	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	601	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	602	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	603	+b
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	604
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	605	% preserve chmod -x
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	606	diff --git a/subdir/f1 b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	607	old mode 100755
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	608	new mode 100644
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	609	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	610	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	611	@@ -2,3 +2,4 @@
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	612	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	613	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	614	b
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	615	+c
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	616	record this change to 'subdir/f1'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	617
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	618	changeset: 24:1460f6e47966
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	619	tag: tip
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	620	user: test
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	621	date: Thu Jan 01 00:00:22 1970 +0000
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	622	summary: ab
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	623
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	624	diff --git a/subdir/f1 b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	625	old mode 100755
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	626	new mode 100644
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	627	--- a/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	628	+++ b/subdir/f1
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	629	@@ -2,3 +2,4 @@
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	630	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	631	a
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	632	b
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	633	+c
6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 7657 diff changeset	634
11237 feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	635	% abort early when a merge is in progress
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	636	1 files updated, 0 files merged, 5 files removed, 0 files unresolved
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	637	marked working directory as branch thatbranch
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	638	5 files updated, 0 files merged, 2 files removed, 0 files unresolved
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	639	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	640	(branch merge, don't forget to commit)
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	641
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	642	abort: cannot partially commit a merge (use hg commit instead)
feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	643	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	644	% with win32ext
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	645	diff --git a/subdir/f1 b/subdir/f1
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	646	1 hunks, 1 lines changed
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	647	examine changes to 'subdir/f1'? [Ynsfdaq?]
d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	648	@@ -3,3 +3,4 @@
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	649	a
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	650	b
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	651	c
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	652	+d
9461 cec9fb4e07a1 record: remove superfluous space timeless@mozdev.org parents: 9291 diff changeset	653	record this change to 'subdir/f1'? [Ynsfdaq?]
10694 d7732d2df54a record: separate each hunk with a blank line Martin Geisler <mg@lazybytes.net> parents: 10490 diff changeset	654
11237 feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	655	changeset: 26:5bacc1f6e9cf
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	656	tag: tip
11237 feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10490 diff changeset	657	parent: 24:1460f6e47966
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	658	user: test
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	659	date: Thu Jan 01 00:00:23 1970 +0000
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	660	summary: w1
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	661
10490 f2618cacb485 filelog: sort meta entries, ensure deterministic order Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 9461 diff changeset	662	diff -r 1460f6e47966 -r 5bacc1f6e9cf subdir/f1
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	663	--- a/subdir/f1 Thu Jan 01 00:00:22 1970 +0000
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	664	+++ b/subdir/f1 Thu Jan 01 00:00:23 1970 +0000
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	665	@@ -3,3 +3,4 @@
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	666	a
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	667	b
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	668	c
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	669	+d
8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 8496 diff changeset	670

author	Wagner Bruna <wbruna@yahoo.com>
	Mon, 02 Aug 2010 13:18:32 -0300
branch	stable
changeset 11736	c00f03a4982e
parent 11321	40c06bbf58be
child 11728	226a328a7ff3
permissions	-rw-r--r--