[Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-17 Thread Andrew Beekhof
because c2d9d5cce14c and 4b4fc04624bb are on a different development stream/branch which didn't get merged in with your changes until c5d0627925f0 remember how you promised to learn about the version control tool you wanted us to use? helpful command: hg glog On May 17, 2007, at 3:44

[Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-20 Thread Alan Robertson
Andrew Beekhof wrote: > because c2d9d5cce14c and 4b4fc04624bb are on a different development > stream/branch which didn't get merged in with your changes until > c5d0627925f0 > > remember how you promised to learn about the version control tool you > wanted us to use? > > helpful command: >hg

Re: [Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-17 Thread Lars Marowsky-Bree
On 2007-05-17T15:58:23, Andrew Beekhof <[EMAIL PROTECTED]> wrote: > because c2d9d5cce14c and 4b4fc04624bb are on a different development > stream/branch which didn't get merged in with your changes until > c5d0627925f0 > > remember how you promised to learn about the version control tool you

Re: [Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-20 Thread Lars Marowsky-Bree
On 2007-05-20T12:54:45, Alan Robertson <[EMAIL PROTECTED]> wrote: > Does silently throwing away changes when doing merges serve some purpose > I've missed out on? I assume that the chances of a pilot error or misunderstanding by someone, somewhere are rather higher than a very popular and scalabl

Re: [Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-21 Thread Lars Marowsky-Bree
On 2007-05-20T12:54:45, Alan Robertson <[EMAIL PROTECTED]> wrote: > > helpful command: > >hg glog > There is no 'glog' subcommand. I assume you meant 'hg log'. http://www.selenic.com/mercurial/wiki/index.cgi/GraphlogExtension ___ Linux-HA-

Re: [Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-21 Thread Dejan Muhamedagic
Hi, On Sun, May 20, 2007 at 10:15:47PM +0200, Lars Marowsky-Bree wrote: > On 2007-05-20T12:54:45, Alan Robertson <[EMAIL PROTECTED]> wrote: > > > Does silently throwing away changes when doing merges serve some purpose > > I've missed out on? > > I assume that the chances of a pilot error or mis

Re: [Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-21 Thread Lars Marowsky-Bree
On 2007-05-21T17:51:20, Dejan Muhamedagic <[EMAIL PROTECTED]> wrote: > $ hg log -r cc868e409675 lrm/lrmd/lrmd.c > $ hg log -r d2639cbc3351 lrm/lrmd/lrmd.c > > show nothing. Does that mean that these changesets have nothing to > do with the lrmd.c? That's because d2639cbc3351 doesn't change lrm/l

Re: [Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-22 Thread Dejan Muhamedagic
On Mon, May 21, 2007 at 11:56:23PM +0200, Lars Marowsky-Bree wrote: > On 2007-05-21T17:51:20, Dejan Muhamedagic <[EMAIL PROTECTED]> wrote: > > > $ hg log -r cc868e409675 lrm/lrmd/lrmd.c > > $ hg log -r d2639cbc3351 lrm/lrmd/lrmd.c > > > > show nothing. Does that mean that these changesets have no

Re: [Linux-ha-dev] Re: Mercurial changes getting lost

2007-05-22 Thread Lars Marowsky-Bree
On 2007-05-22T12:03:27, Dejan Muhamedagic <[EMAIL PROTECTED]> wrote: > There wasn't and I think that I told you what I did: create a new > repository and copy files using cp(1) from the old one and then do > commit/push. I'm so scared of this thing, I won't use the -f in a > thousand years :) Ah,