Mercurial > hg

view tests/test-incoming-outgoing.out @ 11715:4f9dfb54c8b5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qpush --move: move the right patch even with comment lines 88fc876a4833 caused that we find the index of the moving patch in self.series but look it up in self.full_series. The difference between these is that full_series also contains comment lines, and we thus moved the wrong patch. Use back self.full_series to find the moving patch, but take care of striping the patch guard markers before comparing the patch name. Test cases have been added for comments and empty lines in self.full_series, and for the case of guarded patches. Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author Gilles Moris <gilles.moris@free.fr>
date Sat, 10 Jul 2010 21:23:00 +0200
parents ace3cf2bc991
children
line wrap: on
line source

adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 9 changesets, 9 total revisions
comparing with http://localhost:$HGPORT/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with http://localhost:$HGPORT/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

% limit to 2 changesets
comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

% limit to 2 changesets, test with -p --git
comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

diff --git a/foo b/foo
new file mode 100644
--- /dev/null
+++ b/foo
@@ -0,0 +1,1 @@
+0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

diff --git a/foo b/foo
--- a/foo
+++ b/foo
@@ -1,1 +1,2 @@
 0
+1

comparing with http://localhost:$HGPORT/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 14 changesets, 14 total revisions
comparing with test
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11

changeset:   12:251354d0fdd3
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     12

changeset:   13:bdaadd969642
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     13

% limit to 3 changesets
comparing with test
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11

comparing with http://localhost:$HGPORT/
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11

changeset:   12:251354d0fdd3
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     12

changeset:   13:bdaadd969642
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     13

comparing with http://localhost:$HGPORT/
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11