Commits

Martin Geisler committed f4d057e

Backport latest changes from English version

  • Participants
  • Parent commits ff6ea19

Comments (0)

Files changed (1)

File hgsubversion.txt

    date:        Fri Mar 12 21:20:15 2010 +0000
    summary:     Added footer.
    $ hg push \
-     ## | sed -e 's|file://.*|http://mercurial.aragost.com/svn/helloX|'
+     ## | sed -e 's|file://.*|http://mercurial.aragost.com/svn/helloX|' \
+              -e 's|\[r11\] .\+:|[r11] alice:|'
    pushing to http://mercurial.aragost.com/svn/helloX
    searching for changes
-   [r11] mg: Added footer.
+   [r11] alice: Added footer.
    pulled 1 revisions
    saved backup bundle to $HOME/hello-hg/.hg/strip-backup/2dc661f0cdc8-backup.hg
 
    $ ## svn -q propset --revprop -r HEAD svn:date \
             "2010-03-12T21:25:00.0Z" \
             file://$HOME/hello
+   $ ## svn -q propset --revprop -r HEAD svn:author \
+            "alice" \
+            file://$HOME/hello
    $ ## cd ..
    $ ## rm -r hello-hg
    $ ## hg -q clone file://$PWD/hello hello-hg
    $ ## cd hello-hg
    $ hg tip
-   changeset:   9:b4ab312c55ea
+   changeset:   9:a545b3d1c21d
    tag:         tip
-   user:        mg@66d5687c-2042-4ccc-9f0a-7e74790c38a1
+   user:        alice@66d5687c-2042-4ccc-9f0a-7e74790c38a1
    date:        Fri Mar 12 21:25:00 2010 +0000
    summary:     Added footer.
 
    $ hg outgoing \
      ## | sed -e 's|file://.*|http://mercurial.aragost.com/svn/helloX|'
    comparing with http://mercurial.aragost.com/svn/helloX
-   changeset:   10:7d780c6154fb
+   changeset:   10:9a6e43d86b16
    user:        Alice <alice@example.net>
    date:        Fri Mar 12 21:26:00 2010 +0000
    summary:     Express greater joy!
 
-   changeset:   11:12445668eefc
+   changeset:   11:f3bd093438f1
    tag:         tip
    user:        Alice <alice@example.net>
    date:        Fri Mar 12 21:27:00 2010 +0000
    $ ## svn -q commit -m 'List email address for bug reports.'
    $ ## svn -q propset --revprop -r HEAD svn:date \
             "2010-03-12T21:26:30.0Z" file://$HOME/hello
+   $ ## svn -q propset --revprop -r HEAD svn:author \
+            "alice" file://$HOME/hello
    $ ## cd ../hello-hg
    $ hg incoming \
      ## | sed -e 's|file://.*|http://mercurial.aragost.com/svn/helloX|'
    incoming changes from http://mercurial.aragost.com/svn/helloX
 
    revision:    12
-   user:        mg
+   user:        alice
    date:        2010-03-12T21:26:30.0Z
    message:     List email address for bug reports.
    $ hg pull \
      ## | sed -e 's|file://.*|http://mercurial.aragost.com/svn/helloX|'
    pulling from http://mercurial.aragost.com/svn/helloX
-   [r12] mg: List email address for bug reports.
+   [r12] alice: List email address for bug reports.
    pulled 1 revisions
    (run 'hg update' to get a working copy)
    $ ## $SRCDIR/snap-hgtk-log $SRCDIR/hgsubversion-pull.png
 
    $ hg push ## 2>& 1 \
       | sed -e 's|............-backup.hg|xxxxxxxxxxxx-backup.hg|' \
-            -e 's|file://.*|http://mercurial.aragost.com/svn/helloX|'
+            -e 's|file://.*|http://mercurial.aragost.com/svn/helloX|' \
+           -e 's|\(\[r1[34]\]\) .\+:|\1 alice:|'
    pushing to http://mercurial.aragost.com/svn/helloX
    searching for changes
-   [r13] mg: Express greater joy!
+   [r13] alice: Express greater joy!
    pulled 1 revisions
    saved backup bundle to $HOME/hello-hg/.hg/strip-backup/xxxxxxxxxxxx-backup.hg
-   [r14] mg: Added simple MIT license header.
+   [r14] alice: Added simple MIT license header.
    pulled 1 revisions
    saved backup bundle to $HOME/hello-hg/.hg/strip-backup/xxxxxxxxxxxx-backup.hg
    $ ## svn -q propset --revprop -r 13 svn:date \
                "2010-03-12T21:28:00.0Z" \
             file://$HOME/hello
+   $ ## svn -q propset --revprop -r 13 svn:author \
+               "alice" \
+            file://$HOME/hello
    $ ## svn -q propset --revprop -r 14 svn:date \
                "2010-03-12T21:28:00.0Z" \
             file://$HOME/hello
+   $ ## svn -q propset --revprop -r 14 svn:author \
+               "alice" \
+            file://$HOME/hello
    $ ## cd ..
    $ ## rm -r hello-hg
    $ ## hg -q clone file://$PWD/hello hello-hg