2008/5/13 Charles Lepple <[EMAIL PROTECTED]>: > On Tue, May 13, 2008 at 8:19 AM, Arnaud Quette <[EMAIL PROTECTED]> wrote: > > 2008/5/13 Charles Lepple <[EMAIL PROTECTED]>: > > > > > On Tue, May 13, 2008 at 8:09 AM, Arnaud Quette <[EMAIL PROTECTED]> wrote: > > > > 2008/5/12 Charles Lepple <[EMAIL PROTECTED]>: > > > > > > I hope you don't mind that I took the liberty to sync the > > Makefile.am > > > > > with what is actually checked in. > > > > > > > > no problem. Your help is always welcome ;-) > > > > I'm just astonished since both pt*.po are in the repository! > > > > > > They are now :-) When you first synced between the branches, the > > > pt*.po files were not in the trunk. > > > > > > On the other hand, if you use "svn merge" to move changes between > > > branches, it will add files that exist in the source branch but not > > > the destination. (Otherwise, it is like applying a diff.) > > > > yup, I should have gone that way, though I like the 2 local checkout + > > meld for diff'ing / merging more finely... > > can you unapply this change? > > Unapply r1488? I think I fixed it in > http://boxster.ghz.cc/projects/nut/changeset/1491
right, I've just seen it (the Net is too fast today ;-) thanks, -- Arnaud _______________________________________________ Nut-upsdev mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/nut-upsdev
