Conflicts in rmail.el

Conflicts in rmail.el

[Thierry Volpiatto]

Hi,
could someone fix existings conflicts in rmail.el?

--8<---------------cut here---------------start------------->8---
Text conflict in lisp/mail/rmail.el
Conflict adding file lisp/mail/rmail.el.BASE.  Moved existing file to lisp/mail/rmail.el.BASE.moved.
Conflict adding file lisp/mail/rmail.el.OTHER.  Moved existing file to lisp/mail/rmail.el.OTHER.moved.
Conflict adding file lisp/mail/rmail.el.THIS.  Moved existing file to lisp/mail/rmail.el.THIS.moved.
--8<---------------cut here---------------end--------------->8---

--8<---------------cut here---------------start------------->8---
;;;***
\f
<<<<<<< TREE
<<<<<<< TREE
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "b20346e7178c45a313b9cabd004c21fb")
=======
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5d992206e382290d07ad7d9a2bf250c9")
>>>>>>> MERGE-SOURCE
=======
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "a79f498959deded8fa9d88a7dca93bc0")
>>>>>>> MERGE-SOURCE
;;; Generated autoloads from rmailmm.el
--8<---------------cut here---------------end--------------->8---

Thanks.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Conflicts in rmail.el

[Eli Zaretskii]

> From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
> Date: Tue, 15 Nov 2011 21:03:39 +0100
> 
> could someone fix existings conflicts in rmail.el?

Just "bzr revert" and move on.

Re: Conflicts in rmail.el

[Thierry Volpiatto]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
>> Date: Tue, 15 Nov 2011 21:03:39 +0100
>> 
>> could someone fix existings conflicts in rmail.el?
>
> Just "bzr revert" and move on.
Ok thanks.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Conflicts in rmail.el

[Stefan Monnier]

>> could someone fix existings conflicts in rmail.el?
> Just "bzr revert" and move on.

Well, "bzr revert" throws away all the changes you may have, so it's not
necessarily a good idea.  But yes: those conflict are resolved by
choosing any of the three options (and I really mean any: it shouldn't
matter much which one you choose).


        Stefan

Re: Conflicts in rmail.el

[Thierry Volpiatto]

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

>>> could someone fix existings conflicts in rmail.el?
>> Just "bzr revert" and move on.
>
> Well, "bzr revert" throws away all the changes you may have, so it's not
> necessarily a good idea.  But yes: those conflict are resolved by
> choosing any of the three options (and I really mean any: it shouldn't
> matter much which one you choose).
I have no personal changes there, but bzr revert have now reverted two
files:

 M  lisp/emacs-lisp/eieio.el
 M  lisp/mail/rmail.el

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Conflicts in rmail.el

[Eli Zaretskii]

> From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
> Date: Tue, 15 Nov 2011 22:56:43 +0100
> 
> Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
> 
> >>> could someone fix existings conflicts in rmail.el?
> >> Just "bzr revert" and move on.
> >
> > Well, "bzr revert" throws away all the changes you may have, so it's not
> > necessarily a good idea.  But yes: those conflict are resolved by
> > choosing any of the three options (and I really mean any: it shouldn't
> > matter much which one you choose).
> I have no personal changes there, but bzr revert have now reverted two
> files:
> 
>  M  lisp/emacs-lisp/eieio.el
>  M  lisp/mail/rmail.el

Both for the same reasons: autoloads written in those files.

If you care about that (there's no reason to), run "make autoloads" in
the lisp/ subdirectory after reverting.

Re: Conflicts in rmail.el

[Thierry Volpiatto]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
>> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
>> Date: Tue, 15 Nov 2011 22:56:43 +0100
>> 
>> Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
>> 
>> >>> could someone fix existings conflicts in rmail.el?
>> >> Just "bzr revert" and move on.
>> >
>> > Well, "bzr revert" throws away all the changes you may have, so it's not
>> > necessarily a good idea.  But yes: those conflict are resolved by
>> > choosing any of the three options (and I really mean any: it shouldn't
>> > matter much which one you choose).
>> I have no personal changes there, but bzr revert have now reverted two
>> files:
>> 
>>  M  lisp/emacs-lisp/eieio.el
>>  M  lisp/mail/rmail.el
>
> Both for the same reasons: autoloads written in those files.
>
> If you care about that (there's no reason to), run "make autoloads" in
> the lisp/ subdirectory after reverting.
No i don't care, thanks for explanation.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997