nunit-dev team mailing list archive

["Charlie Poole" <charlie@xxxxxxxxx>]

Hi Olof,

I think it should work - and it's what you would have to do if
you accidentally made changes in your trunk. But the canonical
approach is to not make such changes and pull will give you 
an error message if you have made any - telling you to merge
in fact.

So, to make sure you're not messing up, use pull in your
mirror and merge when you want to merge. :-)

Charlie

PS: I'm going to gradually replace the page names that match
the questions themselves with shorter, permanent names - it's 
hard to refactor the text if you have to rename the page
in order to do it. As a side effect, the urls will get shorter. :-)

> -----Original Message-----
> From: Olof Bjarnason [mailto:olof.bjarnason@xxxxxxxxx] 
> Sent: Saturday, August 15, 2009 1:53 PM
> To: Charlie Poole
> Cc: nunit-dev@xxxxxxxxxxxxxxxxxxx
> Subject: Re: [Nunit-dev] Please Review Proposed FAQ on Using Bazaar
> 
> I shortened the URL for those of us using gmail:
> 
> http://tinyurl.com/r6ynfr
> 
> .. and added a question to the Discussion page:
> 
> So using pull on the local trunk of NUnit is different from 
> using merge on a FEATURE branch..? Would merge on the local 
> trunc work equally well? — Olof Bjarnason 2009/08/15 14:07
> 
> 2009/8/15 Charlie Poole <charlie@xxxxxxxxx>:
> > Hi All,
> >
> > As promised, I set aside the "casual contributor" process to first 
> > work on a more mainstream process. The new item in the FAQ is
> >
> > 
> http://nunit.org/wiki/doku.php?id=dev:faq:how_can_i_manage_my_working_
> > copy_o
> > f_nunit
> >
> > Please review and comment.
> >
> > A few background comments:
> >
> > 1. I pushed "How do I submit a merge request?" and related 
> questions 
> > to other FAQ items, which are not yet written. Keeping one 
> FAQ about 
> > one thing seems to be better for reducing duplication. And 
> anyway, we 
> > are still discussing how to do this.
> >
> > 2. I have not recommended the advanced technique that Paul 
> describes 
> > in his blog - where the repository and the working copies 
> are kept in 
> > separate directory branches - because it seems a bit 
> complicated for 
> > people just getting started. However, it's what I'm using 
> and what I 
> > recommend for committers and will publish a separate FAQ 
> item for this 
> > techique.
> >
> > 3. After we have reviewed this one I'll go back to the "Casual 
> > Contributors" item.
> >
> > Charlie
> >
> >> -----Original Message-----
> >> From: nunit-dev-bounces+charlie=nunit.com@xxxxxxxxxxxxxxxxxxx
> >> [mailto:nunit-dev-bounces+charlie=nunit.com@xxxxxxxxxxxxxxxxxx
> >> t] On Behalf Of Charlie Poole
> >> Sent: Thursday, August 13, 2009 9:45 PM
> >> To: nunit-dev@xxxxxxxxxxxxxxxxxxx
> >> Subject: [Nunit-dev] Please Review Proposed FAQ on Using Bazaar
> >>
> >> Hi All,
> >>
> >> I'd appreciate your review of this item in our Developer FAQ:
> >>
> >> http://nunit.org/wiki/doku.php?id=dev:faq:as_a_casual_contribu
> >> tor_how_do_i_f
> >> ix_a_single_nunit_bug
> >>
> >> Does it make sense? Does it seem right?
> >>
> >> I'll follow up shortly with another one for regular contributors.
> >>
> >> Charlie
> >>
> >>
> >>
> >>
> >> _______________________________________________
> >> Mailing list: https://launchpad.net/~nunit-dev Post to     : 
> >> nunit-dev@xxxxxxxxxxxxxxxxxxx Unsubscribe : 
> >> https://launchpad.net/~nunit-dev More help   : 
> >> https://help.launchpad.net/ListHelp
> >>
> >
> >
> >
> >
> > _______________________________________________
> > Mailing list: https://launchpad.net/~nunit-dev Post to     : 
> > nunit-dev@xxxxxxxxxxxxxxxxxxx Unsubscribe : 
> > https://launchpad.net/~nunit-dev More help   : 
> > https://help.launchpad.net/ListHelp
> >
> 
> 
> 
> --
> twitter.com/olofb
> olofb.wordpress.com
> olofb.wordpress.com/tag/english
>