upstream/mercurial-mirror Files · tests/test-mq-strip.out

tests: unify test-abort-checkin

Nicolas Dumazet - - Load All Authors

File last commit:

r11789:e2bce1c7 default


                r11848:f54ff493

default

Download file

             test-mq-strip.out
        
                    278 lines
            
             | 7.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-mq-strip.out

History | Source | Raw |Copy content |Copy permalink

Dirkjan Ochtman mq: don't update the working copy on strip if parents aren't stripped...	r6635	adding bar
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		created new head
		changeset: 4:443431ffac4f
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: e

		changeset: 3:65bd5f99a4a3
		parent: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: d

		changeset: 2:264128213d29
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: c

		changeset: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

		changeset: 0:9ab35a2d17cb
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% before update 4, strip 4
		changeset: 4:443431ffac4f
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: e

		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall strip: improve full backup message	r11200	saved backup bundle to
Dirkjan Ochtman mq: don't update the working copy on strip if parents aren't stripped...	r6635	% after update 4, strip 4
		changeset: 3:65bd5f99a4a3
		tag: tip
		parent: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: d

		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% before update 4, strip 3
		changeset: 4:443431ffac4f
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: e

		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall strip: improve full backup message	r11200	saved backup bundle to
Dirkjan Ochtman mq: don't update the working copy on strip if parents aren't stripped...	r6635	% after update 4, strip 3
		changeset: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% before update 1, strip 4
		changeset: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

Matt Mackall strip: improve full backup message	r11200	saved backup bundle to
Dirkjan Ochtman mq: don't update the working copy on strip if parents aren't stripped...	r6635	% after update 1, strip 4
		changeset: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% before update 4, strip 2
		changeset: 4:443431ffac4f
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: e

Matt Mackall strip: improve full backup message	r11200	saved backup bundle to
Dirkjan Ochtman mq: don't update the working copy on strip if parents aren't stripped...	r6635	% after update 4, strip 2
		changeset: 3:443431ffac4f
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: e

		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% before update 4, strip 1
		changeset: 4:264128213d29
		tag: tip
		parent: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: c

		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall strip: improve full backup message	r11200	saved backup bundle to
Dirkjan Ochtman mq: don't update the working copy on strip if parents aren't stripped...	r6635	% after update 4, strip 1
		changeset: 0:9ab35a2d17cb
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		% before update null, strip 4
Matt Mackall strip: improve full backup message	r11200	saved backup bundle to
Dirkjan Ochtman mq: don't update the working copy on strip if parents aren't stripped...	r6635	% after update null, strip 4
		changeset: 4:264128213d29
		tag: tip
		parent: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: c

		changeset: 3:443431ffac4f
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: e

		changeset: 2:65bd5f99a4a3
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: d

		changeset: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

		changeset: 0:9ab35a2d17cb
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		% before strip of merge parent
		changeset: 2:65bd5f99a4a3
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: d

		changeset: 4:264128213d29
		tag: tip
		parent: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: c

		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall strip: improve full backup message	r11200	saved backup bundle to
Dirkjan Ochtman mq: don't update the working copy on strip if parents aren't stripped...	r6635	% after strip of merge parent
		changeset: 1:ef3a871183d7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

Vishakh H mq: cleanup status if applied mq is stripped (issue1881)...	r11637	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Nicolas Dumazet strip: support multiple revisions	r11789	@ changeset: 4:264128213d29
		\| tag: tip
		\| parent: 1:ef3a871183d7
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: c
		\|
		\| o changeset: 3:443431ffac4f
		\| \| user: test
		\| \| date: Thu Jan 01 00:00:00 1970 +0000
		\| \| summary: e
		\| \|
		\| o changeset: 2:65bd5f99a4a3
		\|/ user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: d
		\|
		o changeset: 1:ef3a871183d7
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:9ab35a2d17cb
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		% 2 is parent of 3, only one strip should happen
		saved backup bundle to
		@ changeset: 2:264128213d29
		\| tag: tip
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: c
		\|
		o changeset: 1:ef3a871183d7
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:9ab35a2d17cb
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		o changeset: 4:443431ffac4f
		\| tag: tip
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: e
		\|
		o changeset: 3:65bd5f99a4a3
		\| parent: 1:ef3a871183d7
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: d
		\|
		\| @ changeset: 2:264128213d29
		\|/ user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: c
		\|
		o changeset: 1:ef3a871183d7
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:9ab35a2d17cb
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		% 2 different branches: 2 strips
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		saved backup bundle to
		saved backup bundle to
		@ changeset: 2:65bd5f99a4a3
		\| tag: tip
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: d
		\|
		o changeset: 1:ef3a871183d7
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:9ab35a2d17cb
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		% 2 different branches and a common ancestor: 1 strip
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		saved backup bundle to
		saved backup bundle to
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vishakh H mq: cleanup status if applied mq is stripped (issue1881)...	r11637	% applied patches before strip
		2.diff
		3.diff
		4.diff
		% stripping revision in queue
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		saved backup bundle to
		% applied patches after stripping rev in queue
		2.diff
		% stripping ancestor of queue
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		saved backup bundle to
		% applied patches after stripping ancestor of queue

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages