[Adduser-devel] argh

[Marc Haber]

On Wed, Apr 26, 2006 at 06:16:27PM +0100, Stephen Gran wrote:
> This one time, at band camp, Marc Haber said:
> > On Wed, Apr 26, 2006 at 04:51:02PM +0100, Stephen Gran wrote:
> > > 
> > > Did you mean to leave the <<<<<<'s in?
> > 
> > No, and there aren't any in my local copy? Which file are you refering
> > to?
> 
> steve at gashuffer:~/trunk$ svn up
> At revision 562.
> steve at gashuffer:~/trunk$ egrep -n '(< \.mine|> \.r562)' adduser
> 109:<<<<<<< .mine
> 114:>>>>>>> .r562
> 132:<<<<<<< .mine
> 144:>>>>>>> .r562
> 196:<<<<<<< .mine
> 200:>>>>>>> .r562
> 204:<<<<<<< .mine
> 208:>>>>>>> .r562
> 210:<<<<<<< .mine
> 214:>>>>>>> .r562

Looks like conflicts of your local working copy with the repository.
try svn revert adduser.

> > It would probably be helpful to svn update again before doing the diff
> > so that you at least incorporate changes that somebody else committed
> > while you were editing into your diff.
> 
> Fair enough.  I will try to get better at it.  In the meantime, sorry
> for the messiness.

No need to be sorry about that, you're a great help.

Greetings
Marc

-- 
-----------------------------------------------------------------------------
Marc Haber         | "I don't trust Computers. They | Mailadresse im Header
Mannheim, Germany  |  lose things."    Winona Ryder | Fon: *49 621 72739834
Nordisch by Nature |  How to make an American Quilt | Fax: *49 621 72739835