view tests/test-command-template.out @ 10251:a19d2993385d stable

subrepo: fix merging of already merged subrepos (issue1986)

This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.

In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.

Test provided by Steve Losh.

created new head
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
created new head
# default style is like normal output
#  normal
#  verbose
#  debug
# revision with no copies (used to print a traceback)

# compact style works
8[tip]   946e2bd9c565   2020-01-01 10:01 +0000   test
  third

7:-1   29114dbae42b   1970-01-12 13:46 +0000   user
  second

6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
  merge

5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
  new head

4   32a18f097fcc   1970-01-17 04:53 +0000   person
  new branch

3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
  no user, no domain

2   97054abb4ab8   1970-01-14 21:20 +0000   other
  no person

1   b608e9d1a3f0   1970-01-13 17:33 +0000   other
  other 1

0   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
  line 1

8[tip]   946e2bd9c565   2020-01-01 10:01 +0000   test
  third

7:-1   29114dbae42b   1970-01-12 13:46 +0000   User Name <user@hostname>
  second

6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
  merge

5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
  new head

4   32a18f097fcc   1970-01-17 04:53 +0000   person
  new branch

3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
  no user, no domain

2   97054abb4ab8   1970-01-14 21:20 +0000   other@place
  no person

1   b608e9d1a3f0   1970-01-13 17:33 +0000   A. N. Other <other@place>
  other 1
other 2

other 3

0   1e4e1b8f71e0   1970-01-12 13:46 +0000   User Name <user@hostname>
  line 1
line 2

8[tip]:7,-1   946e2bd9c565   2020-01-01 10:01 +0000   test
  third

7:-1,-1   29114dbae42b   1970-01-12 13:46 +0000   User Name <user@hostname>
  second

6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
  merge

5:3,-1   13207e5a10d9   1970-01-18 08:40 +0000   person
  new head

4:3,-1   32a18f097fcc   1970-01-17 04:53 +0000   person
  new branch

3:2,-1   10e46f2dcbf4   1970-01-16 01:06 +0000   person
  no user, no domain

2:1,-1   97054abb4ab8   1970-01-14 21:20 +0000   other@place
  no person

1:0,-1   b608e9d1a3f0   1970-01-13 17:33 +0000   A. N. Other <other@place>
  other 1
other 2

other 3

0:-1,-1   1e4e1b8f71e0   1970-01-12 13:46 +0000   User Name <user@hostname>
  line 1
line 2

# error if style not readable
abort: Permission denied: ./q
# error if no style
abort: style not found: notexist
# error if style missing key
abort: ./t: no key named 'changeset'
# error if include fails
abort: template file ./q: Permission denied
# include works
8
7
6
5
4
3
2
1
0
# ui.style works
8
7
6
5
4
3
2
1
0
# issue338
2020-01-01  test  <test>

	* third:
	third
	[946e2bd9c565] [tip]

1970-01-12  User Name  <user@hostname>

	* second:
	second
	[29114dbae42b]

1970-01-18  person  <person>

	* merge
	[c7b487c6c50e]

	* d:
	new head
	[13207e5a10d9]

1970-01-17  person  <person>

	* new branch
	[32a18f097fcc]

1970-01-16  person  <person>

	* c:
	no user, no domain
	[10e46f2dcbf4]

1970-01-14  other  <other@place>

	* c:
	no person
	[97054abb4ab8]

1970-01-13  A. N. Other  <other@place>

	* b:
	other 1 other 2

	other 3
	[b608e9d1a3f0]

1970-01-12  User Name  <user@hostname>

	* a:
	line 1 line 2
	[1e4e1b8f71e0]

# keys work
author: test
author: User Name <user@hostname>
author: person
author: person
author: person
author: person
author: other@place
author: A. N. Other <other@place>
author: User Name <user@hostname>
author--verbose: test
author--verbose: User Name <user@hostname>
author--verbose: person
author--verbose: person
author--verbose: person
author--verbose: person
author--verbose: other@place
author--verbose: A. N. Other <other@place>
author--verbose: User Name <user@hostname>
author--debug: test
author--debug: User Name <user@hostname>
author--debug: person
author--debug: person
author--debug: person
author--debug: person
author--debug: other@place
author--debug: A. N. Other <other@place>
author--debug: User Name <user@hostname>
branches: 
branches: 
branches: 
branches: 
branches: foo
branches: 
branches: 
branches: 
branches: 
branches--verbose: 
branches--verbose: 
branches--verbose: 
branches--verbose: 
branches--verbose: foo
branches--verbose: 
branches--verbose: 
branches--verbose: 
branches--verbose: 
branches--debug: 
branches--debug: 
branches--debug: 
branches--debug: 
branches--debug: foo
branches--debug: 
branches--debug: 
branches--debug: 
branches--debug: 
date: 1577872860.00
date: 1000000.00
date: 1500001.00
date: 1500000.00
date: 1400000.00
date: 1300000.00
date: 1200000.00
date: 1100000.00
date: 1000000.00
date--verbose: 1577872860.00
date--verbose: 1000000.00
date--verbose: 1500001.00
date--verbose: 1500000.00
date--verbose: 1400000.00
date--verbose: 1300000.00
date--verbose: 1200000.00
date--verbose: 1100000.00
date--verbose: 1000000.00
date--debug: 1577872860.00
date--debug: 1000000.00
date--debug: 1500001.00
date--debug: 1500000.00
date--debug: 1400000.00
date--debug: 1300000.00
date--debug: 1200000.00
date--debug: 1100000.00
date--debug: 1000000.00
desc: third
desc: second
desc: merge
desc: new head
desc: new branch
desc: no user, no domain
desc: no person
desc: other 1
other 2

other 3
desc: line 1
line 2
desc--verbose: third
desc--verbose: second
desc--verbose: merge
desc--verbose: new head
desc--verbose: new branch
desc--verbose: no user, no domain
desc--verbose: no person
desc--verbose: other 1
other 2

other 3
desc--verbose: line 1
line 2
desc--debug: third
desc--debug: second
desc--debug: merge
desc--debug: new head
desc--debug: new branch
desc--debug: no user, no domain
desc--debug: no person
desc--debug: other 1
other 2

other 3
desc--debug: line 1
line 2
file_adds: third
file_adds: second
file_adds: 
file_adds: d
file_adds: 
file_adds: 
file_adds: c
file_adds: b
file_adds: a
file_adds--verbose: third
file_adds--verbose: second
file_adds--verbose: 
file_adds--verbose: d
file_adds--verbose: 
file_adds--verbose: 
file_adds--verbose: c
file_adds--verbose: b
file_adds--verbose: a
file_adds--debug: third
file_adds--debug: second
file_adds--debug: 
file_adds--debug: d
file_adds--debug: 
file_adds--debug: 
file_adds--debug: c
file_adds--debug: b
file_adds--debug: a
file_dels: 
file_dels: 
file_dels: 
file_dels: 
file_dels: 
file_dels: 
file_dels: 
file_dels: 
file_dels: 
file_dels--verbose: 
file_dels--verbose: 
file_dels--verbose: 
file_dels--verbose: 
file_dels--verbose: 
file_dels--verbose: 
file_dels--verbose: 
file_dels--verbose: 
file_dels--verbose: 
file_dels--debug: 
file_dels--debug: 
file_dels--debug: 
file_dels--debug: 
file_dels--debug: 
file_dels--debug: 
file_dels--debug: 
file_dels--debug: 
file_dels--debug: 
file_mods: 
file_mods: 
file_mods: 
file_mods: 
file_mods: 
file_mods: c
file_mods: 
file_mods: 
file_mods: 
file_mods--verbose: 
file_mods--verbose: 
file_mods--verbose: 
file_mods--verbose: 
file_mods--verbose: 
file_mods--verbose: c
file_mods--verbose: 
file_mods--verbose: 
file_mods--verbose: 
file_mods--debug: 
file_mods--debug: 
file_mods--debug: 
file_mods--debug: 
file_mods--debug: 
file_mods--debug: c
file_mods--debug: 
file_mods--debug: 
file_mods--debug: 
files: third
files: second
files: 
files: d
files: 
files: c
files: c
files: b
files: a
files--verbose: third
files--verbose: second
files--verbose: 
files--verbose: d
files--verbose: 
files--verbose: c
files--verbose: c
files--verbose: b
files--verbose: a
files--debug: third
files--debug: second
files--debug: 
files--debug: d
files--debug: 
files--debug: c
files--debug: c
files--debug: b
files--debug: a
manifest: 8:8a0d8faab8b2
manifest: 7:f2dbc354b94e
manifest: 6:91015e9dbdd7
manifest: 5:4dc3def4f9b4
manifest: 4:90ae8dda64e1
manifest: 3:cb5a1327723b
manifest: 2:6e0e82995c35
manifest: 1:4e8d705b1e53
manifest: 0:a0c8bcbbb45c
manifest--verbose: 8:8a0d8faab8b2
manifest--verbose: 7:f2dbc354b94e
manifest--verbose: 6:91015e9dbdd7
manifest--verbose: 5:4dc3def4f9b4
manifest--verbose: 4:90ae8dda64e1
manifest--verbose: 3:cb5a1327723b
manifest--verbose: 2:6e0e82995c35
manifest--verbose: 1:4e8d705b1e53
manifest--verbose: 0:a0c8bcbbb45c
manifest--debug: 8:8a0d8faab8b2eee97dcfccabbcb18f413c9d097b
manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf
manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363
manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
node: 946e2bd9c565394777d74d9669045b39e856e3ea
node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
node: 13207e5a10d9fd28ec424934298e176197f2c67f
node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
node: 97054abb4ab824450e9164180baf491ae0078465
node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
node: 1e4e1b8f71e05681d422154f5421e385fec3454f
node--verbose: 946e2bd9c565394777d74d9669045b39e856e3ea
node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
node--verbose: 97054abb4ab824450e9164180baf491ae0078465
node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
node--debug: 946e2bd9c565394777d74d9669045b39e856e3ea
node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
node--debug: 97054abb4ab824450e9164180baf491ae0078465
node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
parents: 
parents: -1:000000000000 
parents: 5:13207e5a10d9 4:32a18f097fcc 
parents: 3:10e46f2dcbf4 
parents: 
parents: 
parents: 
parents: 
parents: 
parents--verbose: 
parents--verbose: -1:000000000000 
parents--verbose: 5:13207e5a10d9 4:32a18f097fcc 
parents--verbose: 3:10e46f2dcbf4 
parents--verbose: 
parents--verbose: 
parents--verbose: 
parents--verbose: 
parents--verbose: 
parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 
parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 
parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 
parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 
parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 
parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
rev: 8
rev: 7
rev: 6
rev: 5
rev: 4
rev: 3
rev: 2
rev: 1
rev: 0
rev--verbose: 8
rev--verbose: 7
rev--verbose: 6
rev--verbose: 5
rev--verbose: 4
rev--verbose: 3
rev--verbose: 2
rev--verbose: 1
rev--verbose: 0
rev--debug: 8
rev--debug: 7
rev--debug: 6
rev--debug: 5
rev--debug: 4
rev--debug: 3
rev--debug: 2
rev--debug: 1
rev--debug: 0
tags: tip
tags: 
tags: 
tags: 
tags: 
tags: 
tags: 
tags: 
tags: 
tags--verbose: tip
tags--verbose: 
tags--verbose: 
tags--verbose: 
tags--verbose: 
tags--verbose: 
tags--verbose: 
tags--verbose: 
tags--verbose: 
tags--debug: tip
tags--debug: 
tags--debug: 
tags--debug: 
tags--debug: 
tags--debug: 
tags--debug: 
tags--debug: 
tags--debug: 
diffstat: 1: +1/-0
diffstat: 1: +1/-0
diffstat: 0: +0/-0
diffstat: 1: +1/-0
diffstat: 0: +0/-0
diffstat: 1: +1/-0
diffstat: 1: +4/-0
diffstat: 1: +2/-0
diffstat: 1: +1/-0
diffstat--verbose: 1: +1/-0
diffstat--verbose: 1: +1/-0
diffstat--verbose: 0: +0/-0
diffstat--verbose: 1: +1/-0
diffstat--verbose: 0: +0/-0
diffstat--verbose: 1: +1/-0
diffstat--verbose: 1: +4/-0
diffstat--verbose: 1: +2/-0
diffstat--verbose: 1: +1/-0
diffstat--debug: 1: +1/-0
diffstat--debug: 1: +1/-0
diffstat--debug: 0: +0/-0
diffstat--debug: 1: +1/-0
diffstat--debug: 0: +0/-0
diffstat--debug: 1: +1/-0
diffstat--debug: 1: +4/-0
diffstat--debug: 1: +2/-0
diffstat--debug: 1: +1/-0
# filters work

hostname




place
place
hostname
test
User Name
person
person
person
person
other
A. N. Other
User Name
test
user
person
person
person
person
other
other
user
in the future
Wed Jan 01 10:01:00 2020 +0000
Mon Jan 12 13:46:40 1970 +0000
Sun Jan 18 08:40:01 1970 +0000
Sun Jan 18 08:40:00 1970 +0000
Sat Jan 17 04:53:20 1970 +0000
Fri Jan 16 01:06:40 1970 +0000
Wed Jan 14 21:20:00 1970 +0000
Tue Jan 13 17:33:20 1970 +0000
Mon Jan 12 13:46:40 1970 +0000
2020-01-01 10:01 +0000
1970-01-12 13:46 +0000
1970-01-18 08:40 +0000
1970-01-18 08:40 +0000
1970-01-17 04:53 +0000
1970-01-16 01:06 +0000
1970-01-14 21:20 +0000
1970-01-13 17:33 +0000
1970-01-12 13:46 +0000
2020-01-01 10:01:00 +0000
1970-01-12 13:46:40 +0000
1970-01-18 08:40:01 +0000
1970-01-18 08:40:00 +0000
1970-01-17 04:53:20 +0000
1970-01-16 01:06:40 +0000
1970-01-14 21:20:00 +0000
1970-01-13 17:33:20 +0000
1970-01-12 13:46:40 +0000
Wed, 01 Jan 2020 10:01:00 +0000
Mon, 12 Jan 1970 13:46:40 +0000
Sun, 18 Jan 1970 08:40:01 +0000
Sun, 18 Jan 1970 08:40:00 +0000
Sat, 17 Jan 1970 04:53:20 +0000
Fri, 16 Jan 1970 01:06:40 +0000
Wed, 14 Jan 1970 21:20:00 +0000
Tue, 13 Jan 1970 17:33:20 +0000
Mon, 12 Jan 1970 13:46:40 +0000
third
second
merge
new head
new branch
no user, no domain
no person
other 1
line 1
946e2bd9c565
29114dbae42b
c7b487c6c50e
13207e5a10d9
32a18f097fcc
10e46f2dcbf4
97054abb4ab8
b608e9d1a3f0
1e4e1b8f71e0
<changeset author="test"/>
<changeset author="User Name &lt;user@hostname&gt;"/>
<changeset author="person"/>
<changeset author="person"/>
<changeset author="person"/>
<changeset author="person"/>
<changeset author="other@place"/>
<changeset author="A. N. Other &lt;other@place&gt;"/>
<changeset author="User Name &lt;user@hostname&gt;"/>
# formatnode filter works
#  quiet
1e4e1b8f71e0
#  normal
1e4e1b8f71e0
#  verbose
1e4e1b8f71e0
#  debug
1e4e1b8f71e05681d422154f5421e385fec3454f
# error on syntax
abort: t:3: unmatched quotes
# latesttag
adding file
adding head1
adding head2
created new head
# No tag set
5: null+5
4: null+4
3: null+3
2: null+3
1: null+2
0: null+1
# one common tag: longuest path wins
6: t1+4
5: t1+3
4: t1+2
3: t1+1
2: t1+1
1: t1+0
0: null+1
# one ancestor tag: more recent wins
7: t2+3
6: t2+2
5: t2+1
4: t1+2
3: t1+1
2: t2+0
1: t1+0
0: null+1
# two branch tags: more recent wins
8: t3+5
7: t3+4
6: t3+3
5: t3+2
4: t3+1
3: t3+0
2: t2+0
1: t1+0
0: null+1
# merged tag overrides
10: t5+5
9: t5+4
8: t5+3
7: t5+2
6: t5+1
5: t5+0
4: at3:t3+1
3: at3:t3+0
2: t2+0
1: t1+0
0: null+1
# style path expansion (issue1948)
test 10:dee8f28249af
# done