mercurial at 16801: 10 new changesets (4 stable)

Mercurial Commits hg at intevation.org
Wed May 30 14:40:07 CDT 2012


10 new changesets (4 stable) in mercurial:

http://selenic.com/repo/hg//rev/ad394c897b16
changeset:   16792:ad394c897b16
parent:      16778:2ac08d8b21aa
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Wed May 23 17:25:48 2012 +0200
summary:     merge: do not warn about copy and rename in the same transaction (issue2113)

http://selenic.com/repo/hg//rev/9cbc44a6600e
changeset:   16793:9cbc44a6600e
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Wed May 23 17:33:19 2012 +0200
summary:     tests: do not create repos inside repos in test-rename-merge1.t

http://selenic.com/repo/hg//rev/98687cdddcb1
changeset:   16794:98687cdddcb1
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Wed May 23 20:50:16 2012 +0200
summary:     merge: warn about file deleted in one branch and renamed in other (issue3074)

http://selenic.com/repo/hg//rev/e9ae770eff1c
changeset:   16795:e9ae770eff1c
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Wed May 23 21:34:29 2012 +0200
summary:     merge: show renamed on one and deleted on the other side in debug output

http://selenic.com/repo/hg//rev/b748106fe616
changeset:   16796:b748106fe616
branch:      stable
parent:      16772:30e46d7138de
user:        Wagner Bruna <wbruna at yahoo.com>
date:        Sun May 27 09:52:25 2012 -0300
summary:     i18n-pt_BR: synchronized with 0a730d3c5aae

http://selenic.com/repo/hg//rev/2478594b37c2
changeset:   16797:2478594b37c2
branch:      stable
user:        Alexander Sauta <demosito at gmail.com>
date:        Sun May 27 15:37:36 2012 +0100
summary:     i1n-ru:synchronized with b748106fe616

http://selenic.com/repo/hg//rev/9aa590007c7b
changeset:   16798:9aa590007c7b
branch:      stable
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Tue May 29 21:32:50 2012 +0900
summary:     i18n-ja: synchronized with 2478594b37c2

http://selenic.com/repo/hg//rev/0568c499c44a
changeset:   16799:0568c499c44a
branch:      stable
parent:      16790:2a0efa1112ac
parent:      16798:9aa590007c7b
user:        Matt Mackall <mpm at selenic.com>
date:        Wed May 30 14:31:29 2012 -0500
summary:     merge with i18n

http://selenic.com/repo/hg//rev/ca025a920fa4
changeset:   16800:ca025a920fa4
parent:      16791:977c80123835
parent:      16795:e9ae770eff1c
user:        Matt Mackall <mpm at selenic.com>
date:        Wed May 30 14:31:39 2012 -0500
summary:     merge with crew

http://selenic.com/repo/hg//rev/f694ab54b660
changeset:   16801:f694ab54b660
tag:         tip
parent:      16800:ca025a920fa4
parent:      16799:0568c499c44a
user:        Matt Mackall <mpm at selenic.com>
date:        Wed May 30 14:31:51 2012 -0500
summary:     merge with stable

-- 
Repository URL: http://selenic.com/repo/hg/


More information about the Mercurial-devel mailing list