[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
Since we are talking about Emacs features now, I will move this
to emacs-devel.
--
RMS: I'd like to note that I too have had annoying problems with git
regarding merge conflicts, in the past.
My solution was to hand patch everything. I know the code much better
now!
On 2019-11-10 03:49, Richard Stallman wrote:
[[[ To any NSA and FBI agents reading my email: please
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> > How about adding a user option to enable or disable the creation of
> > the
Eli Zaretskii wrote:
> Richard Stallman wrote:
>> When I got the conflict, it displayed several windows. I did not know what
>> these windows were showing me, so I was totally unable to proceed. I did
>> not dare try to find out by trial and error what those windows were showing,
>> not
> From: Richard Stallman
> Cc: psm...@gnu.org, gnu-system-discuss@gnu.org
> Date: Sat, 09 Nov 2019 13:04:23 -0500
>
> How about adding a user option to enable or disable the creation of
> the multiple windows?
>
> (Is it Smerge mode which does that?)
Smerge mode doesn't, so we need first to
> From: Richard Stallman
> Cc: psm...@gnu.org, gnu-system-discuss@gnu.org
> Date: Sat, 09 Nov 2019 13:04:19 -0500
>
> > Smerge mode is a minor mode, so I don't see why you'd want to turn it
> > off, it doesn't get in the way of your editing in any way.
>
> When I got the conflict, it
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> > If smerge mode is useful in this situation, how about making its use
> >
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> > > The only difference is that after resolving the conflicts you need to
>
> From: Richard Stallman
> Cc: psm...@gnu.org, gnu-system-discuss@gnu.org
> Date: Fri, 08 Nov 2019 22:26:51 -0500
>
> > The only difference is that after resolving the conflicts you need to
> > say "git commit", so that the conflict resolution is recorded in your
> > local repository.
>
>
> From: Richard Stallman
> Cc: psm...@gnu.org, gnu-system-discuss@gnu.org
> Date: Thu, 07 Nov 2019 14:29:47 -0500
>
> Before checking in changes, I do cvs update to merge in any changes in
> the repository. (I can't remember whether attempting to do checkin
> does an update first; if not,
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> Would you mind describing in detail your workflow for handling merge
>
> Date: Thu, 7 Nov 2019 14:51:26 +
> From: Adam Spiers
> Cc: gnu-system-discuss@gnu.org
>
> >I wonder when did you last took a look at Emacs's VC. It was
> >completely revamped several years ago to support dVCSes, and I'd be
> >surprised to learn that its functionality is only 5% of what
> Date: Fri, 1 Nov 2019 14:52:21 +
> From: Adam Spiers
> Cc: Taylan Kammer , gnu-system-discuss@gnu.org
>
> git uses fundamentally different paradigm to the model on which VC was
> designed. One of many examples of this is that it requires staging changes
> before committing them. My
> From: Richard Stallman
> Cc: gnu-system-discuss@gnu.org
> Date: Wed, 06 Nov 2019 23:43:56 -0500
>
> > I'll just say, for posterity, that avoiding staging is not difficult if
> > you have simple requirements. A single command that creates a commit
> > containing all modified files
On Thu, Nov 07, 2019 at 03:54:23PM +0200, Eli Zaretskii wrote:
Date: Fri, 1 Nov 2019 14:52:21 +
From: Adam Spiers
Cc: Taylan Kammer , gnu-system-discuss@gnu.org
git uses fundamentally different paradigm to the model on which VC was
designed. One of many examples of this is that it
> From: Adam Spiers
> Date: Wed, 6 Nov 2019 10:24:09 +
> Cc: Dmitry Alexandrov <321...@gmail.com>, gnu-system-discuss@gnu.org
>
> A wild guess, based on previous conversation in this thread, is that
> maybe you resolved the conflict in emacs but didn't stage the
> resolution before
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> I'll just say, for posterity, that avoiding staging is not difficult if
> you
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> A wild guess, based on previous conversation in this thread, is that
> maybe
On Wed, 6 Nov 2019 at 04:11, Richard Stallman wrote:
> That's what people told me: that i could use the same vc commands
> with git and they would work.
>
> But that was not so. When there was a merge conflict, git fell on the
> floor and I was stuck.
I'm not sure what you mean exactly by
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> Whatever it is, you absolutely do not need to deal with
> awkwardness of git
On Mon, 2019-11-04 at 22:14 -0500, Richard Stallman wrote:
> However, it meant that my simple recipe for committing my changes
> did not work.
Without knowing what your recipe tries to do or what did not work about
it, we cannot comment. Anyway, it doesn't seem that you're looking for
help with
Richard Stallman wrote:
> Adam Spiers wrote:
> > git uses fundamentally different paradigm to the model on which VC was
> designed. One of many examples of this is that it requires staging changes
> before committing them.
>
> Maybe that is the aspect that convinced me to give up on using
You could make a script to automate it into one command:
git add [FILE]
git commit -m "x" [FILE]
torify git push
Don't give up on git yet.
Otherwise what if you want to make large sweeping additions to the
fully-free 3d videogame I contribute to?
( libregamewiki.org/Chaos_Esque_Anthology )
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
If you like the staging feature, I am glad that git pleases you.
However, it meant
If RMS is new to git you can make it simple:
You update a file you edited to git (example: updating some QuakeC code
and some 3d models and textures):
git add file1.qc file2.qc
../../models/bots/girls/12yrold_latemodel_lod1.iqm
../../models/bots/girls/12yr*iqm*skin*
On Sun, Nov 03, 2019 at 11:55:51PM -0500, Paul Smith wrote:
On Sun, 2019-11-03 at 22:50 -0500, Richard Stallman wrote:
git uses fundamentally different paradigm to the model on which VC
was designed. One of many examples of this is that it requires
staging changes before committing them.
On Sun, 2019-11-03 at 22:50 -0500, Richard Stallman wrote:
> > git uses fundamentally different paradigm to the model on which VC
> > was designed. One of many examples of this is that it requires
> > staging changes before committing them.
>
> Maybe that is the aspect that convinced me to
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> git uses fundamentally different paradigm to the model on which VC
> was
On Fri, Nov 01, 2019 at 03:01:16PM +0300, Dmitry Alexandrov wrote:
Adam Spiers wrote:
On Mon, 28 Oct 2019 at 00:12, Taylan Kammer wrote:
On 28.10.2019 00:51, Richard Stallman wrote:
I don't know how CVS handles merge conflicts, but the Emacs extension Magit is
a very nice front-end to Git
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
Would someone like to do the work required to get Magit included in
GNU Emacs? It
Adam Spiers wrote:
> On Mon, 28 Oct 2019 at 00:12, Taylan Kammer wrote:
>>
>> On 28.10.2019 00:51, Richard Stallman wrote:
>> I don't know how CVS handles merge conflicts, but the Emacs extension Magit
>> is a very nice front-end to Git
>
> I strongly recommend any emacs user who switches to
On Mon, 28 Oct 2019 at 00:12, Taylan Kammer wrote:
>
> On 28.10.2019 00:51, Richard Stallman wrote:
> > Is it possible to write a front-end for Git which reliably handles
> > merge conflicts the way CVS handles them? Given that, I expect I
> > could use Git.
>
> I don't know how CVS handles
[[[ To any NSA and FBI agents reading my email: please consider]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> I will try to do some research this weekend if no one finds an answer
> first.
Richard Stallman writes:
> Is it possible to write a front-end for Git which reliably handles
> merge conflicts the way CVS handles them? Given that, I expect I
> could use Git.
I will try to do some research this weekend if no one finds an answer
first. What front-ends do you use for CVS?
Personally, I use smerge-mode in Emacs for Git.
Dmitry Alexandrov writes:
> Taylan Kammer wrote:
>> On 28.10.2019 00:51, Richard Stallman wrote:
>>> Is it possible to write a front-end for Git which reliably handles merge
>>> conflicts the way CVS handles them?
>>
>> I don't know how CVS
Taylan Kammer wrote:
> On 28.10.2019 00:51, Richard Stallman wrote:
>> Is it possible to write a front-end for Git which reliably handles merge
>> conflicts the way CVS handles them?
>
> I don't know how CVS handles merge conflicts
Well, IIRC, the same way git-merge(1) does¹: by creating a file
Taylan Kammer wrote:
> Magit is a very nice front-end to Git and aides with merging as well.
> https://magit.vc/manual/magit/Resolving-Conflicts.html
The linked manual says:
| Magit does not provide its own tools for conflict resolution
signature.asc
Description: PGP signature
On 28.10.2019 00:51, Richard Stallman wrote:
> Is it possible to write a front-end for Git which reliably handles
> merge conflicts the way CVS handles them? Given that, I expect I
> could use Git.
I don't know how CVS handles merge conflicts, but the Emacs extension
Magit is a very nice
38 matches
Mail list logo
