Re: pvDataWWW has three heads

[White, G. <gr...@sl...>]

Marty,

I think the matter of 3 heads is now cleaned up. I abandoned them rather than merged or hg backout. Specifically I used update --close-branch.

To remove rev 362:

[gregsmac:epicsV4/ev4hg/pvDataWWW] greg% hg update -r 362
13 files updated, 0 files merged, 2 files removed, 0 files unresolved
[gregsmac:epicsV4/ev4hg/pvDataWWW] greg% hg commit --close-branch -m "closing unused branch, throwing away redundant changes to index.html"
[gregsmac:epicsV4/ev4hg/pvDataWWW] greg% hg update -C default
15 files updated, 0 files merged, 0 files removed, 0 files unresolved
[gregsmac:epicsV4/ev4hg/pvDataWWW] greg% hg push

To remove rev 361 (360 after above):

[gregsmac:epicsV4/ev4hg/pvDataWWW] greg% hg update -r 360
11 files updated, 0 files merged, 3 files removed, 0 files unresolved
gregsmac:epicsV4/ev4hg/pvDataWWW] greg% hg commit --close-branch -m "closing unused branch, throwing away changes I made to arch.html since now too superceeded"
[gregsmac:epicsV4/ev4hg/pvDataWWW] greg% hg update -C default
14 files updated, 0 files merged, 0 files removed, 0 files unresolved
[gregsmac:epicsV4/ev4hg/pvDataWWW] greg% hg push

I hope this is right. The result seems to be now that the tip is not the default. The default is our main brach, but the tip it seems is the closed branch for rev 360. Maybe I should now merge tip and default. That is, merge rev 381 with 383 creating 384, and then merge 382 with the new 384? *Matej*?

Too tired to try it now, will see what hg guru's have to say and make a test tomorrow.

Greg



On 9 Jul 2012, at 12:19, Marty Kraimer <mrk...@co...> wrote:

> mrk> pwd
> /home/mrk/hg/pvDataWWW
> mrk> hg heads
> changeset:   377:93e896a3eb54
> tag:         tip
> user:        jrowlandls
> date:        Thu Jun 21 10:17:41 2012 +0100
> summary:     updated arch header
> 
> changeset:   362:65c8bd599da0
> parent:      357:b64854aba5c5
> user:        gr...@sl...
> date:        Tue May 22 15:59:16 2012 +0200
> summary:     Fix broken links per talks and literature
> 
> changeset:   361:677bdf049ceb
> user:        gr...@sl...
> date:        Mon May 21 18:05:02 2012 +0200
> summary:     Merged in James' references
> 
> 
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/