From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Merge conflicts are reported relative to root not cwd
Date: Wed, 13 Apr 2016 15:18:24 -0700 [thread overview]
Message-ID: <CAGZ79kZSyLZxMXSSv=uDpuA0zTUy6nU4vwEF5f7WLhoRp1hXig@mail.gmail.com> (raw)
In-Reply-To: <xmqq4mb5jhm7.fsf@gitster.mtv.corp.google.com>
On Wed, Apr 13, 2016 at 2:58 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> $ cd t/
>> $ git merge ...
>> ...
>> Auto-merging builtin/submodule--helper.c
>> Auto-merging builtin/fetch.c
>> CONFLICT (content): Merge conflict in builtin/fetch.c
>> Auto-merging builtin/clone.c
>> Auto-merging README.md
>> ...
>>
>> It should say ../builtin/fetch.c IMHO.
>> Any reason to keep the old behavior?
>
> I actually prefer to see the "relative to root" behaviour when it
> comes to things like this, that lets you view the things that happen
> in the whole-tree context.
>
> I would have to go insane before I start a whole-tree operation like
> "git merge" from deep in my tree, but if I happened to do that, e.g.
>
> cd perl/blib/lib/Git/SVN/Memoize
> git merge other-branch
>
> I'd rather see that the conflicted path, e.g. builtin/fetch.c,
> reported by showing it like the above output, not happening in
> ../../../../../../builtin/fetch.c which I have to count the
> up-dots to know which file it is talking about.
>
* In most trees you would still know which file is referred to, as
there are no /$PATH/builtin/fetch.c files except for PATH=<empty>
So I'd see that as a minor issue.
* This is your preference for whole-tree operations. What are
whole-tree operations? (Is there a concise definition?
Are submodules whole tree operations?)
These questions are motivated by origin/sb/submodule-path-misc-bugs
which a) fixes bugs and b) makes submodule handling consistent to the
relative-to-cwd philosophy. As most submodule commands touch all
submodules in the tree, we could argue it is a whole-tree operation, and
you'd like to see submodule paths from the root level, too.
I'd like to avoid adding confusion here. So is there a an easy way to tell apart
which commands you would expect to use relative-to-cwd and which use
relative-to-root?
next prev parent reply other threads:[~2016-04-13 22:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 21:37 Merge conflicts are reported relative to root not cwd Stefan Beller
2016-04-13 21:58 ` Junio C Hamano
2016-04-13 22:18 ` Stefan Beller [this message]
2016-04-13 22:40 ` Junio C Hamano
2016-04-13 22:41 ` Jeff King
2016-04-13 22:52 ` Stefan Beller
2016-04-14 7:53 ` Eric Deplagne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGZ79kZSyLZxMXSSv=uDpuA0zTUy6nU4vwEF5f7WLhoRp1hXig@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.