* Conflicts in rmail.el
@ 2011-11-15 20:03 Thierry Volpiatto
2011-11-15 20:27 ` Eli Zaretskii
0 siblings, 1 reply; 7+ messages in thread
From: Thierry Volpiatto @ 2011-11-15 20:03 UTC (permalink / raw)
To: emacs-devel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Conflicts in rmail.el
2011-11-15 20:03 Conflicts in rmail.el Thierry Volpiatto
@ 2011-11-15 20:27 ` Eli Zaretskii
2011-11-15 21:38 ` Thierry Volpiatto
2011-11-15 21:46 ` Stefan Monnier
0 siblings, 2 replies; 7+ messages in thread
From: Eli Zaretskii @ 2011-11-15 20:27 UTC (permalink / raw)
To: Thierry Volpiatto; +Cc: emacs-devel
> 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Conflicts in rmail.el
2011-11-15 20:27 ` Eli Zaretskii
@ 2011-11-15 21:38 ` Thierry Volpiatto
2011-11-15 21:46 ` Stefan Monnier
1 sibling, 0 replies; 7+ messages in thread
From: Thierry Volpiatto @ 2011-11-15 21:38 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Conflicts in rmail.el
2011-11-15 20:27 ` Eli Zaretskii
2011-11-15 21:38 ` Thierry Volpiatto
@ 2011-11-15 21:46 ` Stefan Monnier
2011-11-15 21:56 ` Thierry Volpiatto
1 sibling, 1 reply; 7+ messages in thread
From: Stefan Monnier @ 2011-11-15 21:46 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel, Thierry Volpiatto
>> 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: Conflicts in rmail.el
2011-11-15 21:46 ` Stefan Monnier
@ 2011-11-15 21:56 ` Thierry Volpiatto
2011-11-16 3:50 ` Eli Zaretskii
0 siblings, 1 reply; 7+ messages in thread
From: Thierry Volpiatto @ 2011-11-15 21:56 UTC (permalink / raw)
To: Stefan Monnier; +Cc: Eli Zaretskii, emacs-devel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Conflicts in rmail.el
2011-11-15 21:56 ` Thierry Volpiatto
@ 2011-11-16 3:50 ` Eli Zaretskii
2011-11-16 7:25 ` Thierry Volpiatto
0 siblings, 1 reply; 7+ messages in thread
From: Eli Zaretskii @ 2011-11-16 3:50 UTC (permalink / raw)
To: Thierry Volpiatto; +Cc: monnier, emacs-devel
> 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Conflicts in rmail.el
2011-11-16 3:50 ` Eli Zaretskii
@ 2011-11-16 7:25 ` Thierry Volpiatto
0 siblings, 0 replies; 7+ messages in thread
From: Thierry Volpiatto @ 2011-11-16 7:25 UTC (permalink / raw)
To: emacs-devel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-11-16 7:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-15 20:03 Conflicts in rmail.el Thierry Volpiatto
2011-11-15 20:27 ` Eli Zaretskii
2011-11-15 21:38 ` Thierry Volpiatto
2011-11-15 21:46 ` Stefan Monnier
2011-11-15 21:56 ` Thierry Volpiatto
2011-11-16 3:50 ` Eli Zaretskii
2011-11-16 7:25 ` Thierry Volpiatto
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).