On Fri, 29 Jul 2011 22:22:05 -0400
"R. David Murray" wrote:
> On Fri, 29 Jul 2011 23:36:03 +0200, Antoine Pitrou
> wrote:
> > On Fri, 29 Jul 2011 12:19:45 -0400
> > "R. David Murray" wrote:
> > >
> > > > Besides, "hg status" is meant to show untracked files which could
> > > > *potentially* b
On Fri, Jul 29, 2011 at 7:22 PM, R. David Murray wrote:
> On Fri, 29 Jul 2011 23:36:03 +0200, Antoine Pitrou
> wrote:
>> On Fri, 29 Jul 2011 12:19:45 -0400
>> "R. David Murray" wrote:
>> >
>> > > Besides, "hg status" is meant to show untracked files which could
>> > > *potentially* be tracked.
On Fri, 29 Jul 2011 23:36:03 +0200, Antoine Pitrou wrote:
> On Fri, 29 Jul 2011 12:19:45 -0400
> "R. David Murray" wrote:
> >
> > > Besides, "hg status" is meant to show untracked files which could
> > > *potentially* be tracked. It's not like anybody wants to track .orig
> > > and .rej files, s
Antoine Pitrou writes:
> Besides, "hg status" is meant to show untracked files which could
> *potentially* be tracked.
And if you don't want to track them, you need to deal with them somehow.
> It's not like anybody wants to track .orig and .rej files, so having
> them in the ignore list is sti
On Fri, 29 Jul 2011 12:19:45 -0400
"R. David Murray" wrote:
>
> > Besides, "hg status" is meant to show untracked files which could
> > *potentially* be tracked. It's not like anybody wants to track .orig
> > and .rej files, so having them in the ignore list is still the right
> > thing to do.
>
On Fri, 29 Jul 2011 16:49:35 +0200, Antoine Pitrou wrote:
> On Fri, 29 Jul 2011 16:21:42 +0200 wrote:
> > > What use are these backups really? We are using a (D)VCS, you are not
> > > losing anything.
> >
> > The .orig files after a revert could contain code thatâs not committed
> > anywhere.
On Fri, 29 Jul 2011 16:21:42 +0200
Éric Araujo wrote:
> > What use are these backups really? We are using a (D)VCS, you are not
> > losing anything.
>
> The .orig files after a revert could contain code that’s not committed
> anywhere. See also RDM’s reply to your message.
I would point out tha
On Fri, 29 Jul 2011 15:38:31 +0200, Antoine Pitrou wrote:
> On Fri, 29 Jul 2011 15:28:44 +0200 > Ãric Araujo wrote:
> > make clean removes generated files, but *.rej and *.orig are backups,
> > which you may want to save or re-apply.
>
> What use are these backups really? We are using a (D)VCS,
>> People confused by the merge/resolve system could exit their merge tool
>> without actually merging the changes (I know it happened to me!), so
>> these files act as a reminder that not everything is right.
>
> I don't know, I don't use a merge tool. But presumably the merge tool
> would only c
On Fri, 29 Jul 2011 15:28:44 +0200, =?UTF-8?B?w4lyaWMgQXJhdWpv?=
wrote:
> Le 29/07/2011 14:50, Antoine Pitrou a écrit :
> >> changeset: 71562:bdad5bc9a2ed
> >> user:Ãric Araujo
> >> summary:
> >> Stop ignoring Mercurial merge conflits files (#12255).
> >>
> >> R. David Murray and I
On Fri, 29 Jul 2011 15:28:44 +0200
Éric Araujo wrote:
> Le 29/07/2011 14:50, Antoine Pitrou a écrit :
> >> changeset: 71562:bdad5bc9a2ed
> >> user:Éric Araujo
> >> summary:
> >> Stop ignoring Mercurial merge conflits files (#12255).
> >>
> >> R. David Murray and I think that it’s more
Le 29/07/2011 14:50, Antoine Pitrou a écrit :
>> changeset: 71562:bdad5bc9a2ed
>> user:Éric Araujo
>> summary:
>> Stop ignoring Mercurial merge conflits files (#12255).
>>
>> R. David Murray and I think that it’s more useful to have these files
>> show up in the output of “hg status”,
On Fri, 29 Jul 2011 14:35:24 +0200
eric.araujo wrote:
> http://hg.python.org/cpython/rev/bdad5bc9a2ed
> changeset: 71562:bdad5bc9a2ed
> branch: 3.2
> user:Éric Araujo
> date:Thu Jul 28 22:45:46 2011 +0200
> summary:
> Stop ignoring Mercurial merge conflits files (#12255).
13 matches
Mail list logo
