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

author	Martin Geisler <mg@aragost.com>
	Thu, 22 Apr 2010 10:24:49 +0200
changeset 10973	49a07f441496
parent 10964	aa0426c79664
child 11238	a5922547b5cc
permissions	-rw-r--r--