- From: Eric Prud'hommeaux <eric@w3.org>
- Date: Tue, 29 Jan 2013 14:44:07 -0500
- To: yves@w3.org
- Cc: "public-ldp-wg@w3.org" <public-ldp-wg@w3.org>
I tried to push some tests up to dvcs and got:
$ hg commit -m "copied from SWObjects/tests/test_LDP.cpp"
created new head
There were indeed lots of heads:
changeset: 53:eff1638769ae
tag: tip
parent: 47:a4349bff5f64
user: Eric Prud'hommeaux <eric@w3.org>
date: Tue Jan 29 13:18:50 2013 -0500
summary: copied from SWObjects/tests/test_LDP.cpp
changeset: 52:6252c6802ae2
parent: 47:a4349bff5f64
user: Yves Lafon <ylafon@w3.org>
date: Tue Jan 29 11:21:25 2013 +0100
summary: typo fixed in links
changeset: 51:d59818c9354e
branch: fpwd
user: Yves Lafon <ylafon@w3.org>
date: Mon Jan 28 22:39:37 2013 +0100
summary: broken links again
I glogged it to get my head around the branches:
$ hg glog --template '{node|short}: {desc}\n' | head -20
@ eff1638769ae: copied from SWObjects/tests/test_LDP.cpp
|
| o 6252c6802ae2: typo fixed in links
|/
| o d59818c9354e: broken links again
| |
| o 6f423bbac849: broken links
| |
| o 8852dd22606b: moved date to thursday 31st
| |
| o ed18dfa6c561: fpwd
|/
o a4349bff5f64: why respec output <section> here?
|
o a56c74d03222: changed feedback list to the publicly writable list
|
o eb4c45eb9bd2: moved to xhtml
|
o ae2c3bbfadeb: generated version
|
and then presumptuously merged the three heads:
$ hg merge -r 6252c6802ae2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m "hg merge -r 6252c6802ae2"
hg merge -r d59818c9354e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m "hg merge -r d59818c9354e"
and finally did an $(hg push). I hope the branches that I merged in
were intended to apply to the main branch.
--
-ericP
Received on Tuesday, 29 January 2013 19:44:36 UTC