##// END OF EJS Templates
Merge with stable
Sune Foldager -
r10019:4e3a8f3e merge default
parent child Browse files
Show More
@@ -230,6 +230,7 b' def patchbomb(ui, repo, *revs, **opts):'
230 230 def outgoing(dest, revs):
231 231 '''Return the revisions present locally but not in dest'''
232 232 dest = ui.expandpath(dest or 'default-push', dest or 'default')
233 dest, revs, checkout = hg.parseurl(dest, revs)
233 234 revs = [repo.lookup(rev) for rev in revs]
234 235 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
235 236 ui.status(_('comparing with %s\n') % dest)
@@ -182,3 +182,11 b' export HGENCODING'
182 182 hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" \
183 183 -s test -r 0
184 184 cat tmp.mbox | fixheaders
185
186 echo "% test outgoing and dest#branch URIs"
187 hg up 1
188 hg branch test
189 echo d > d
190 hg add d
191 hg ci -md -d '4 0'
192 hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t#test | fixheaders
@@ -1533,3 +1533,38 b' diff -r 000000000000 -r 8580ff50825a a'
1533 1533 +a
1534 1534
1535 1535
1536 % test outgoing and dest#branch URIs
1537 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
1538 marked working directory as branch test
1539 created new head
1540 comparing with ../t
1541 searching for changes
1542 This patch series consists of 1 patches.
1543
1544
1545 Displaying [PATCH] test ...
1546 Content-Type: text/plain; charset="us-ascii"
1547 MIME-Version: 1.0
1548 Content-Transfer-Encoding: 7bit
1549 Subject: [PATCH] test
1550 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
1551 Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@
1552 User-Agent: Mercurial-patchbomb
1553 Date: Tue, 01 Jan 1980 00:01:00 +0000
1554 From: test
1555 To: foo
1556
1557 # HG changeset patch
1558 # User test
1559 # Date 4 0
1560 # Branch test
1561 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
1562 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1563 d
1564
1565 diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
1566 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1567 +++ b/d Thu Jan 01 00:00:04 1970 +0000
1568 @@ -0,0 +1,1 @@
1569 +d
1570
General Comments 0
You need to be logged in to leave comments. Login now