Commits

Martin Geisler committed 7902291

Remove unneeded timezone from commands

Comments (0)

Files changed (6)

src/basic/index.txt

 .. shelltest::
    :name: alice
 
-   $ hg commit -m "First version of hello"## -d "2010-03-10 20:10:05 UTC"
+   $ hg commit -m "First version of hello"## -d "2010-03-10 20:10:05"
 
 No output indicates success --- Mercurial wont interrupt you unless
 necessary.
 
    $ echo >> hello.txt
    $ echo "by Alice." >> hello.txt
-   $ hg commit -m "Added author." ## -d "2010-03-10 20:15:00 UTC"
+   $ hg commit -m "Added author." ## -d "2010-03-10 20:15:00"
 
 We can now ask Mercurial to annotate the file, that is, to show when
 each line was last modified:
    $ echo "by Bob." >> goodbye.txt
    $ hg add
    adding goodbye.txt
-   $ hg commit -m "My goodbye file." ## -d "2010-03-11 10:00:00 UTC"
+   $ hg commit -m "My goodbye file." ## -d "2010-03-11 10:00:00"
    $ echo >> hello.txt
    $ echo "not by Bob." >> hello.txt
-   $ hg commit -m "Not my file." ## -d "2010-03-11 10:03:00 UTC"
+   $ hg commit -m "Not my file." ## -d "2010-03-11 10:03:00"
    $ ## snap-tortoisehg "$DSTDIR/bob-log.png"
 
 The repository now has four changesets:
    +Hello, Wonderful World!
 
     by Alice.
-   $ hg commit -m "Happy, happy!" ## -d "2010-03-11 11:05:00 UTC"
+   $ hg commit -m "Happy, happy!" ## -d "2010-03-11 11:05:00"
 
 At the same time, Bob is working. He creates a new file:
 
    $ echo "Welcome!" > welcome.txt
    $ hg add
    adding welcome.txt
-   $ hg commit -m "Welcome file." ## -d "2010-03-11 11:04:00 UTC"
+   $ hg commit -m "Welcome file." ## -d "2010-03-11 11:04:00"
 
 Both Alice and Bob have now made a changeset that is a child of
 ``51b2976b01e8``, but neither of them knows about this since they have
 .. shelltest::
    :name: alice
 
-   $ hg commit -m "Merge with Bob." ## -d "2010-03-11 11:10:00 UTC"
+   $ hg commit -m "Merge with Bob." ## -d "2010-03-11 11:10:00"
    $ ## snap-tortoisehg "$DSTDIR/alice-merged.png"
 
 The two heads are now bound together in the changeset graph:

src/bookmarks/index.txt

    $ echo "The Phrase Book Project" > README.txt
    $ hg add
    adding README.txt
-   $ hg commit -m "Added a README" ## -d "2012-05-01 10:20:30 UTC"
+   $ hg commit -m "Added a README" ## -d "2012-05-01 10:20:30"
 
 Alice and Bob each have their own clone and push/pull to/from Carla's
 repository, which acts as a central repository. Typically, the central
    $ echo "Hello!" > greetings.txt
    $ hg add
    adding greetings.txt
-   $ hg commit -m "First greeting" ## -d "2012-05-01 10:20:35 UTC"
+   $ hg commit -m "First greeting" ## -d "2012-05-01 10:20:35"
    $ ## snap-tortoisehg "$DSTDIR/alice-pre-bookmark.png"
 
 Adding a Bookmark
 
    $ echo "When does the bus arrive?" > traveling.txt
    $ hg add traveling.txt
-   $ hg commit -m "Started on traveling phrases" ## -d "2012-05-01 10:20:40 UTC"
+   $ hg commit -m "Started on traveling phrases" ## -d "2012-05-01 10:20:40"
    created new head
    $ ## snap-tortoisehg "$DSTDIR/alice-traveling-moved.png"
 
    :name: carla
 
    $ echo "by Alice, Bob, and Carla" >> README.txt
-   $ hg commit -m "Added authors" ## -d "2012-05-01 10:20:45 UTC"
+   $ hg commit -m "Added authors" ## -d "2012-05-01 10:20:45"
 
 This means that Alice's ``traveling`` feature branch will become a
 second head when she pushes. Mercurial will thus abort the push by
    :name: alice
 
    $ echo "Two tickets, please!" >> traveling.txt
-   $ hg commit -m "A ticket phrase" ## -d "2012-05-01 10:20:50 UTC"
+   $ hg commit -m "A ticket phrase" ## -d "2012-05-01 10:20:50"
    $ hg push
    pushing to /home/carla/phrases
    searching for changes
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    $ echo "Where is the train station?" >> traveling.txt
    $ hg commit -m "Asking for a train station" \
-     ## -d "2012-05-01 10:20:55 UTC"
+     ## -d "2012-05-01 10:20:55"
    $ hg push
    pushing to /home/carla/phrases
    searching for changes
 
    $ echo "How much for a ticket?" >> traveling.txt
    $ hg commit -m "Asking for the ticket price" \
-     ## -d "2012-05-01 10:21:00 UTC"
+     ## -d "2012-05-01 10:21:00"
 
 As usual in Mercurial, she will notice the new commit from Bob when
 she tries to push back to the server:
     Two tickets, please!
     How much for a ticket?
    +Where is the train station?
-   $ hg commit -m "Merged with Bob" ## -d "2012-05-01 10:21:05 UTC"
+   $ hg commit -m "Merged with Bob" ## -d "2012-05-01 10:21:05"
 
 After the merge, the divergent bookmark is still around:
 
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    (branch merge, don't forget to commit)
    $ hg commit -m "Merged with traveling branch" \
-     ## -d "2012-05-01 10:21:10 UTC"
+     ## -d "2012-05-01 10:21:10"
    $ ## snap-tortoisehg "$DSTDIR/alice-after-merge.png"
 
 The result is as you would expect:
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    (branch merge, don't forget to commit)
    $ hg commit -m "Merged greetings branch" \
-     ## -d "2012-05-01 10:21:15 UTC"
+     ## -d "2012-05-01 10:21:15"
    $ hg bookmark --delete greetings
    $ hg push -B greetings -r .
    pushing to /home/carla/phrases

src/hgsubversion/index.txt

            return 0;
     }
    +/* The End. */
-   $ hg commit -m "Added footer." ##-d "2010-03-12 21:20:15 UTC"
+   $ hg commit -m "Added footer." ##-d "2010-03-12 21:20:15"
 
 The change is not yet on the Subversion server --- like normal, `hg
 push` is needed. Pushing the changeset involves rewriting it. This is
    :name: alice
 
    $ ## sed -e "s|Hello, World|Hello, Wonderful World|" -i hello.c
-   $ ## hg commit -m "Express greater joy!" -d "2010-03-12 21:26:00 UTC"
+   $ ## hg commit -m "Express greater joy!" -d "2010-03-12 21:26:00"
    $ ## echo "/*" > tmp
    $ ## echo "Copyright (c) 2010 Alice"                                           >> tmp
    $ ## echo                                                                      >> tmp
    $ ## echo "*/"                                                                 >> tmp
    $ ## cat hello.c >> tmp
    $ ## mv tmp hello.c
-   $ ## hg commit -m "Added simple MIT license header." \
-                  -d "2010-03-12 21:27:00 UTC"
+   $ ## hg commit -m "Added simple MIT license header." -d "2010-03-12 21:27:00"
    $ hg outgoing \
      ## | sed -e "s|file://.*|http://mercurial.aragost.com/svn/helloX|"
    comparing with http://mercurial.aragost.com/svn/helloX

src/remote/index.txt

 
    $ cd hello
    $ echo "Hello, World!" > hello.txt
-   $ hg commit -m "Add comma" ## -d "2011-01-22 10:00 UTC"
+   $ hg commit -m "Add comma" ## -d "2011-01-22 10:00"
 
 This is the essense of distributed revision control --- Alice can get
 her own independent copy of the repository and work on it locally. She

src/subrepositories/index.txt

    $ cd subrepo
    $ echo a > a.txt
    $ hg add a.txt
-   $ hg commit -m "A" ## -d "2010-03-10 20:10:05 UTC"
+   $ hg commit -m "A" ## -d "2010-03-10 20:10:05"
    $ echo b > b.txt
    $ hg add b.txt
-   $ hg commit -m "B" ## -d "2010-03-10 20:11:05 UTC"
+   $ hg commit -m "B" ## -d "2010-03-10 20:11:05"
    $ echo c > c.txt
    $ hg add c.txt
-   $ hg commit -m "C" ## -d "2010-03-10 20:12:05 UTC"
+   $ hg commit -m "C" ## -d "2010-03-10 20:12:05"
    $ cd ..
    $ hg commit -m "Main repo"
 
    remoterepo
    subrepo
    svnrepo
-   $ hg commit -m "In folder" ## -d "2010-03-10 20:13:05 UTC"
+   $ hg commit -m "In folder" ## -d "2010-03-10 20:13:05"
    $ echo 'notinfolder' > 2.txt
    $ hg add 2.txt
    $ hg commit -m "Not in folder"

src/tasks/index.txt

    $ ## cd ../default/carla
    $ ## echo "Goodbye, World!" > hello.txt
    $ ## hg add hello.txt
-   $ ## hg commit -m "Initial import." -d "2010-03-01 10:20:30 UTC"
+   $ ## hg commit -m "Initial import." -d "2010-03-01 10:20:30"
    $ ## hg -q push
 
 This is only to make the examples easier.
    $ hg branch issue-1
    marked working directory as branch issue-1
    (branches are permanent and global, did you want a bookmark?)
-   $ hg commit -m "Starting branch for Issue 1." ## -d "2010-03-15 10:25:00 UTC"
+   $ hg commit -m "Starting branch for Issue 1." ## -d "2010-03-15 10:25:00"
 
 The `hg branch` command does not change the history or working copy in
 itself, it only ensure that the next commit is "stamped" with
    @@ -1,1 +1,1 @@
    -Goodbye, World!
    +Hey, World!
-   $ hg commit -m "Fixed Issue 1." ## -d "2010-03-15 10:30:00 UTC"
+   $ hg commit -m "Fixed Issue 1." ## -d "2010-03-15 10:30:00"
 
 The world now looks like this:
 
 
    $ ## echo "Classic Greetings!"   > README
    $ ## hg add README
-   $ ## hg commit -m "Added README." -d "2010-03-02 14:30:00 UTC"
+   $ ## hg commit -m "Added README." -d "2010-03-02 14:30:00"
    $ hg glog
    @  changeset:   1:550bad1893cf
    |  tag:         tip
    $ hg branch
    issue-1
    $ echo "Hello, World!" > hello.txt
-   $ hg commit -m "Really fix Issue 1." ## -d "2010-03-15 13:20:00 UTC"
+   $ hg commit -m "Really fix Issue 1." ## -d "2010-03-15 13:20:00"
 
 Carla pulls the new change:
 
    :name: carla
 
    $ hg commit --close-branch -m "Close branch, Issue 1 is fixed." \
-     ## -d "2010-03-15 13:24:00 UTC"
+     ## -d "2010-03-15 13:24:00"
 
 This makes the ``issue-1`` branch disappear from the `hg branches`
 list:
    $ hg merge issue-1
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    (branch merge, don't forget to commit)
-   $ hg commit -m "Merged fix for Issue 1." ## -d "2010-03-15 13:25:00 UTC"
+   $ hg commit -m "Merged fix for Issue 1." ## -d "2010-03-15 13:25:00"
 
 By updating to ``default`` first, she ensures that the merge changeset
 is created on ``default`` and not on ``issue-1``, where it does not
    $ hg branch issue-2
    marked working directory as branch issue-2
    (branches are permanent and global, did you want a bookmark?)
-   $ hg commit -m "Began Issue 2 branch." ## -d "2010-03-09 11:30:00 UTC"
+   $ hg commit -m "Began Issue 2 branch." ## -d "2010-03-09 11:30:00"
    $ hg rename hello.txt hello.en.txt
-   $ hg commit -m "English translation." ## -d "2010-03-09 11:32:00 UTC"
+   $ hg commit -m "English translation." ## -d "2010-03-09 11:32:00"
 
 He quickly creates a Danish and a German version and commits those too:
 
    adding hello.da.txt
    adding hello.de.txt
    $ hg commit -m "Danish and German translations." \
-     ## -d "2010-03-09 11:45:00 UTC"
+     ## -d "2010-03-09 11:45:00"
    $ ## snap-tortoisehg "$DSTDIR/bob-first-commits.png"
 
 He needs some more time to research the French translation, so he
    0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    (branch merge, don't forget to commit)
    $ hg commit -m "Merge in bugfix from default." \
-     ## -d "2010-03-09 12:35:00 UTC"
+     ## -d "2010-03-09 12:35:00"
    $ ## snap-tortoisehg "$DSTDIR/bob-merge-bugfix.png"
 
 Notice how smoothly Alice's change to ``hello.txt`` was merged into
    $ echo "Bonjour tout le monde !" > hello.fr.txt
    $ hg add hello.fr.txt
    $ hg commit -m "French translation." \
-     ## -d "2010-03-09 12:45:00 UTC"
+     ## -d "2010-03-09 12:45:00"
 
 .. __: `Merging Renamed Files in Subversion`_
 
    $ hg update issue-2
    4 files updated, 0 files merged, 1 files removed, 0 files unresolved
    $ hg commit --close-branch -m "Close branch, Issue 2 is fixed." \
-     ## -d "2010-03-16 10:10:00 UTC"
+     ## -d "2010-03-16 10:10:00"
    $ hg update default
    1 files updated, 0 files merged, 4 files removed, 0 files unresolved
    $ hg merge issue-2
    4 files updated, 0 files merged, 1 files removed, 0 files unresolved
    (branch merge, don't forget to commit)
-   $ hg commit -m "Merged fix for Issue 2." ## -d "2010-03-16 10:15:00 UTC"
+   $ hg commit -m "Merged fix for Issue 2." ## -d "2010-03-16 10:15:00"
    $ ## snap-tortoisehg "$DSTDIR/carla-merge-issue-2.png"
 
 The final changeset graph shows nicely how the ``default`` branch (in
    $ ## cd ../graft
    $ ## echo > a.txt
    $ ## hg add a.txt
-   $ ## hg -q commit -m "First version." -d "2010-03-18 10:15:00 UTC"
+   $ ## hg -q commit -m "First version." -d "2010-03-18 10:15:00"
    $ ## hg -q branch stable
-   $ ## hg -q commit -m "Started stable branch." -d "2010-03-18 10:20:00 UTC"
-   $ ## hg -q tag 1.0 -d "2010-03-18 10:25:00 UTC"
+   $ ## hg -q commit -m "Started stable branch." -d "2010-03-18 10:20:00"
+   $ ## hg -q tag 1.0 -d "2010-03-18 10:25:00"
    $ ## hg -q update default
    $ ## echo >> a.txt
-   $ ## hg -q commit -m "New feature." -d "2010-03-18 10:30:00 UTC"
+   $ ## hg -q commit -m "New feature." -d "2010-03-18 10:30:00"
    $ ## echo >> a.txt
-   $ ## hg -q commit -m "Documentation." -d "2010-03-18 10:35:00 UTC"
+   $ ## hg -q commit -m "Documentation." -d "2010-03-18 10:35:00"
    $ ## hg -q update stable
    $ ## echo > b.txt
    $ ## hg add b.txt
-   $ ## hg -q commit -m "Important bugfix." -d "2010-03-18 10:40:00 UTC"
+   $ ## hg -q commit -m "Important bugfix." -d "2010-03-18 10:40:00"
    $ ## hg -q update default
    $ ## hg -q merge stable
-   $ ## hg -q commit -m "Merge with stable." -d "2010-03-18 10:45:00 UTC"
+   $ ## hg -q commit -m "Merge with stable." -d "2010-03-18 10:45:00"
    $ ## echo >> a.txt
-   $ ## hg -q commit -m "Fix new feature." -d "2010-03-18 10:50:00 UTC"
+   $ ## hg -q commit -m "Fix new feature." -d "2010-03-18 10:50:00"
    $ ## hg -q update stable
    $ ## hg -q merge default
-   $ ## hg -q commit -m "Merge default into stable." -d "2010-03-18 10:55:00 UTC"
-   $ ## hg -q tag 2.0 -d "2010-03-18 11:00:00 UTC"
+   $ ## hg -q commit -m "Merge default into stable." -d "2010-03-18 10:55:00"
+   $ ## hg -q tag 2.0 -d "2010-03-18 11:00:00"
    $ ## hg -q update default
    $ ## hg -q merge stable
-   $ ## hg -q commit -m "Merge with stable." -d "2010-03-18 11:05:00 UTC"
-   $ ## hg -q commit -m "Cool feature." -d "2010-03-18 11:10:00 UTC"
+   $ ## hg -q commit -m "Merge with stable." -d "2010-03-18 11:05:00"
+   $ ## hg -q commit -m "Cool feature." -d "2010-03-18 11:10:00"
    $ ## echo >> a.txt
-   $ ## hg -q commit -m "Experimental feature." -d "2010-03-18 11:15:00 UTC"
+   $ ## hg -q commit -m "Experimental feature." -d "2010-03-18 11:15:00"
    $ ## echo > c.txt
    $ ## hg add c.txt
-   $ ## hg -q commit -m "Fixed old bug." -d "2010-03-18 11:20:00 UTC"
+   $ ## hg -q commit -m "Fixed old bug." -d "2010-03-18 11:20:00"
    $ ## hg -q update stable
    $ ## snap-tortoisehg "$DSTDIR/carla-graft-before.png"
 
    $ hg merge stable
    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    (branch merge, don't forget to commit)
-   $ hg commit -m "Merge with stable." ## -d "2010-03-18 11:25:00 UTC"
+   $ hg commit -m "Merge with stable." ## -d "2010-03-18 11:25:00"
    $ ## snap-tortoisehg "$DSTDIR/carla-graft-merged.png"
 
 Note that changesets are not really moved with this technique. In a