headers
Raphael Kubo da Costa | 1 Feb 01:07
Picon
Favicon

Re: New branch for No Gnus

Lars Ingebrigtsen <larsi <at> gnus.org> writes:

> Steinar Bang <sb <at> dod.no> writes:
>
>> If you know that the current changes in no-gnus that differ from master
>> don't apply, then just
>>  git fetch
>>  git merge -s ours orgin/no-gnus
>> and you won't be bothered by those changes on future merges (until those
>> files change again)
>>
>> "-s ours" means "make it look like a merge, but all stuff on the current
>> branch stays the way it is".
>
> Great!  That has to be just what I need right now, I think, since none
> of the changes I made to No Gnus should end up in Ma Gnus.
>
> I'll try that now...

Are you sure "-s ours" is what you are looking for? If you are on branch
master and use `git merge -s ours no-gnus`, it will effectively bring
no-gnus' history in, but discard _all_ changes from no-gnus.
Permalink | Reply | 20 comments |
headers
Lars Ingebrigtsen | 1 Feb 01:31
Picon
Favicon

Re: New branch for No Gnus

Raphael Kubo da Costa <rakuco <at> FreeBSD.org> writes:

> Are you sure "-s ours" is what you are looking for? If you are on branch
> master and use `git merge -s ours no-gnus`, it will effectively bring
> no-gnus' history in, but discard _all_ changes from no-gnus.

I didn't want the history, either, but I did want to discard all the
changes.

--

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome
Permalink | Reply | 2 comments |
headers
Lars Ingebrigtsen | 1 Feb 01:33
Picon
Favicon

Re: [Q] winmail.dat

Eric S Fraga <e.fraga <at> ucl.ac.uk> writes:

> I would definitely find this useful, not just for tnef and tar that you
> mention but also for zip files.

Sure, that should be equally easy.

I wonder whether the result should be a multipart/alternative containing
a multipart/mixed (with all the single files) and the original tar
archive as the alternative.  That way you can toggle between seeing all
the individual files and the archive.  At present is displays both the
archive as well as the individual files.

What would be least confusing?

--

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome
Permalink | Reply | 6 comments |
headers
Andreas Schwab | 1 Feb 01:36

Re: New branch for No Gnus

Raphael Kubo da Costa <rakuco <at> FreeBSD.org> writes:

> Lars Ingebrigtsen <larsi <at> gnus.org> writes:
>
>> Steinar Bang <sb <at> dod.no> writes:
>>
>>> If you know that the current changes in no-gnus that differ from master
>>> don't apply, then just
>>>  git fetch
>>>  git merge -s ours orgin/no-gnus
>>> and you won't be bothered by those changes on future merges (until those
>>> files change again)
>>>
>>> "-s ours" means "make it look like a merge, but all stuff on the current
>>> branch stays the way it is".
>>
>> Great!  That has to be just what I need right now, I think, since none
>> of the changes I made to No Gnus should end up in Ma Gnus.
>>
>> I'll try that now...
>
> Are you sure "-s ours" is what you are looking for? If you are on branch
> master and use `git merge -s ours no-gnus`, it will effectively bring
> no-gnus' history in, but discard _all_ changes from no-gnus.

The two commits that were merged here are only intended for the no-gnus
branch, so it looks good.

Andreas.
(Continue reading)

Permalink | Reply | 0 comments |
headers
Katsumi Yamaoka | 1 Feb 01:38
X-Face
Favicon
Gravatar

Re: New branch for No Gnus

Er, is it me who broke the no-gnus branch?
Now it looks like having been overridden by the trunk.

$ grep gnus-version ngnus/lisp/gnus.el
(defconst gnus-version-number "0.2"
(defconst gnus-version (format "Ma Gnus v%s" gnus-version-number)
                                        gnus-version (gnus-emacs-version)))

I did the recipe, Steinar Bang wrote in <87aa54riih.fsf <at> dod.no>.
The cvslog list did no report about it so far, though.
Permalink | Reply | 15 comments |
headers
Raphael Kubo da Costa | 1 Feb 01:40
Picon
Favicon

Re: New branch for No Gnus

Lars Ingebrigtsen <larsi <at> gnus.org> writes:

> Raphael Kubo da Costa <rakuco <at> FreeBSD.org> writes:
>
>> Are you sure "-s ours" is what you are looking for? If you are on branch
>> master and use `git merge -s ours no-gnus`, it will effectively bring
>> no-gnus' history in, but discard _all_ changes from no-gnus.
>
> I didn't want the history, either, but I did want to discard all the
> changes.

I thought the opposite was the desired outcome? I mean, if you are in
master and merge no-gnus, you'd want the commits made to no-gnus in the
commit log and also the bug fixes they bring. If you use "-s ours",
you'll only get the history, but all the commit contents (ie. bug fixes)
will be dropped.
Permalink | Reply | 1 comment |
headers
Andreas Schwab | 1 Feb 01:46

Re: New branch for No Gnus

Lars Ingebrigtsen <larsi <at> gnus.org> writes:

> So does anybody know how to make git spit who created a branch?  I sure
> can't, after googling for half an hour.

You can only find that out from the server log, to see who ran the push.

To undo the damange, you can do "git revert -m 2 HEAD" on the no-gnus
branch.

Andreas.

--

-- 
Andreas Schwab, schwab <at> linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Permalink | Reply | 6 comments |
headers
Lars Ingebrigtsen | 1 Feb 02:13
Picon
Favicon

Re: New branch for No Gnus

Katsumi Yamaoka <yamaoka <at> jpl.org> writes:

> Er, is it me who broke the no-gnus branch?

I think so.  :-)  I sent you an email a while ago...

> Now it looks like having been overridden by the trunk.

[...]

> I did the recipe, Steinar Bang wrote in <87aa54riih.fsf <at> dod.no>.

Yeah, that was just for creating the branch and stuff.  You should just
have to have done "cvs checkout no-gnus" to get the No Gnus branch.
Nothing further would have been necessary, I think?

Anyway, anybody know what's the best way to clean this up?  Does git
have a total "rollback" feature?  Or is it better to just apply
reverse-patches to the No Gnus branch?

And the ma-gnus branch has to be deleted, but that's easy, I think.  I
think I saw that somewhere...

--

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome
Permalink | Reply | 14 comments |
headers
Lars Ingebrigtsen | 1 Feb 02:14
Picon
Favicon

Re: New branch for No Gnus

Andreas Schwab <schwab <at> linux-m68k.org> writes:

> To undo the damange, you can do "git revert -m 2 HEAD" on the no-gnus
> branch.

Great!  I'll do that...

--

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome
Permalink | Reply | 5 comments |
headers
Lars Ingebrigtsen | 1 Feb 02:16
Picon
Favicon

Re: New branch for No Gnus

Lars Ingebrigtsen <larsi <at> gnus.org> writes:

>> To undo the damange, you can do "git revert -m 2 HEAD" on the no-gnus
>> branch.
>
> Great!  I'll do that...

Just to be totally sure I'm not screwing anything up:  Should I do a
"git pull" in my local No Gnus tree before saying "git revert -m 2
HEAD", and then pushing out, or should I just do the revert without
pulling from git.gnus.org first?

--

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome
Permalink | Reply | 4 comments |

Gmane