Changeset cb7fd20c752c…
Parent 2032dd08b000…
by
Changes to 4 files · Browse files at cb7fd20c752c Showing diff from parent 2032dd08b000 Diff from another changeset...
|
|
@@ -43,7 +43,7 @@ ''')
hgt.hg(['commit', '-m', 'add files'])
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
changeset: 0:da6857b8d2bf
tag: tip
@@ -70,13 +70,13 @@kbfiles: 4 to upload
''')
hgt.hg(['push'],
- stdout='''pushing to %s/Repo/Test/Test/test
+ stdout='''pushing to %s/Repo/Test/Test/Test
searching for changes
searching for changes
remote: kiln: successfully pushed one changeset
''' % kilntest.KILNURL)
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
no changes found
searching for changes
@@ -97,12 +97,12 @@''')
os.chdir('repo2')
hgt.hg(['in'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
no changes found
''' % kilntest.KILNURL, status=1)
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
no changes found
searching for changes
@@ -112,7 +112,7 @@hgt.writefile('b4', 'b44')
hgt.hg(['commit', '-m', 'edit n4 and b4'])
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
changeset: 1:8499483c24d0
tag: tip
@@ -126,14 +126,14 @@
''' % kilntest.KILNURL)
hgt.hg(['push'],
- stdout='''pushing to %s/Repo/Test/Test/test
+ stdout='''pushing to %s/Repo/Test/Test/Test
searching for changes
searching for changes
remote: kiln: successfully pushed one changeset
''' % kilntest.KILNURL)
os.chdir('../repo1')
hgt.hg(['in'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
changeset: 1:8499483c24d0
tag: tip
@@ -143,14 +143,14 @@
''' % kilntest.KILNURL)
hgt.hg(['out'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
no changes found
''' % kilntest.KILNURL)
hgt.hg(['mv', 'n4', 'b4', 'a'])
hgt.hg(['commit', '-m', 'move n4 and b4'])
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
changeset: 1:6b693340d9c6
tag: tip
@@ -167,7 +167,7 @@# to stderr at some version after Mercurial 1.6. Just don't check stdout/stderr.
hgt.hg(['push'], stdout=hgtest.ANYTHING, stderr=hgtest.ANYTHING, status=[1, 255])
hgt.hg(['pull'],
- stdout='''pulling from %s/Repo/Test/Test/test
+ stdout='''pulling from %s/Repo/Test/Test/Test
searching for changes
adding changesets
adding manifests
@@ -185,7 +185,7 @@''')
hgt.hg(['commit', '-m', 'merge'])
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
changeset: 1:6b693340d9c6
user: test
@@ -215,20 +215,20 @@searching for changes
kbfiles: 1 to upload
''')
-hgt.hg(['push'], stdout='''pushing to %s/Repo/Test/Test/test
+hgt.hg(['push'], stdout='''pushing to %s/Repo/Test/Test/Test
searching for changes
searching for changes
remote: kiln: successfully pushed 2 changesets
''' % kilntest.KILNURL)
os.chdir('../repo2')
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
no changes found
searching for changes
kbfiles: No remote repo
''' % kilntest.KILNURL)
-hgt.hg(['in'], stdout='''comparing with %s/Repo/Test/Test/test
+hgt.hg(['in'], stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
changeset: 2:6b693340d9c6
parent: 0:da6857b8d2bf
@@ -245,7 +245,7 @@summary: merge
''' % kilntest.KILNURL)
-hgt.hg(['pull'], stdout='''pulling from %s/Repo/Test/Test/test
+hgt.hg(['pull'], stdout='''pulling from %s/Repo/Test/Test/Test
searching for changes
adding changesets
adding manifests
@@ -254,7 +254,7 @@(run 'hg update' to get a working copy)
''' % kilntest.KILNURL)
hgt.hg(['in'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
no changes found
''' % kilntest.KILNURL, status=1)
@@ -270,7 +270,7 @@hgt.writefile('a/b1', 'b11')
hgt.hg(['commit', '-m', 'edit n1 and b1'])
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
changeset: 4:fdb0cdc62a97
tag: tip
@@ -302,7 +302,7 @@hgt.writefile('a/b/b2', 'b22')
hgt.hg(['commit', '-m', 'edit n22 and b22'])
hgt.hg(['out', '--bf'],
- stdout='''comparing with %s/Repo/Test/Test/test
+ stdout='''comparing with %s/Repo/Test/Test/Test
searching for changes
changeset: 4:fdb0cdc62a97
user: test
@@ -332,14 +332,14 @@kbfiles: 2 to upload
''')
hgt.hg(['push'],
- stdout='''pushing to %s/Repo/Test/Test/test
+ stdout='''pushing to %s/Repo/Test/Test/Test
searching for changes
searching for changes
remote: kiln: successfully pushed 2 changesets
''' % kilntest.KILNURL)
os.chdir('../repo2')
hgt.hg(['pull'],
- stdout='''pulling from %s/Repo/Test/Test/test
+ stdout='''pulling from %s/Repo/Test/Test/Test
searching for changes
adding changesets
adding manifests
|
@@ -43,7 +43,7 @@ ''')
hgt.hg(['commit', '-m', 'add files'])
hgt.hg(['push'],
- stdout='''pushing to %s/Repo/Test/Test/test
+ stdout='''pushing to %s/Repo/Test/Test/Test
searching for changes
searching for changes
remote: kiln: successfully pushed one changeset
@@ -62,7 +62,7 @@ stdout='requesting all changes\n', log=False,
stderr='abort: HTTP Error 400: To access this repository, install the kiln-bfiles extension from %s/Tools\n' % kilntest.KILNURL, status=255)
os.chdir('repo1')
-hgt.hg(['push'], stdout='''pushing to %s/Repo/Test/Test/test
+hgt.hg(['push'], stdout='''pushing to %s/Repo/Test/Test/Test
searching for changes
remote: ERROR: Big file a/b1 at revision 1 has not been uploaded to the kiln server.
remote: ERROR: All big files must be uploaded to the kiln server before the repository is changed.
|
@@ -42,7 +42,7 @@ ''')
hgt.hg(['commit', '-m', 'add files'])
hgt.hg(['push'],
- stdout='''pushing to localkiln://Repo/Test/Test/test
+ stdout='''pushing to localkiln://Repo/Test/Test/Test
searching for changes
searching for changes
remote: kiln: successfully pushed one changeset
|
@@ -1,5 +1,5 @@ % setup
-hg clone localkiln://Repo/Test/Test/test repo1
+hg clone localkiln://Repo/Test/Test/Test repo1
hg add n1 b/n2 b/c/n3 ../n4
hg add --bf
hg commit -m 'add files'
|
Loading...