From: Martin Langhoff <martin.langhoff@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Merging limitations after directory renames -- interesting test repo
Date: Fri, 18 Feb 2011 13:58:48 -0500 [thread overview]
Message-ID: <AANLkTimsQmOLDENX27YqpicBeFFZrfgEAsLvFiJqoV7w@mail.gmail.com> (raw)
Briefly,
Fetch git://dev.laptop.org/git/users/martin/etherpad and try to merge
pg and master. A ton of work is left to do by hand, and you don't even
get useful conflicts.
- Many paths that shoud succeed don't seem to succeed. After using
git merge, tell me if this file doesn't look like at least git should
have _attempted_ a diff3 on it:
gitk --all -- etherpad/bin/rebuildjar.sh
trunk/etherpad/bin/rebuildjar.sh
trunk/trunk/etherpad/bin/rebuildjar.sh
- Git diff seems confused, says "path needs merge" instead of giving
me a diff. May be related to the first problem
git diff -- etherpad/bin/rebuildjar.sh
However I can
git diff master -- etherpad/bin/rebuildjar.sh
git diff pg -- etherpad/bin/rebuildjar.sh
Note note! The "pg" branch you see has been artificially rebuilt so I
may have made a mistake. However, I've reviewed all the commits and it
seems correct. Original repo comes from SVN via hg -- see
git://github.com/ether/pad.git
Most importantly, even if I misfired here or there, the resulting
history of the paths reads like something git _can_ make sense of if
it traces the history of the paths carefully.
cheers,
m
--
martin.langhoff@gmail.com
martin@laptop.org -- Software Architect - OLPC
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.laptop.org/go/User:Martinlanghoff
next reply other threads:[~2011-02-18 18:59 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-18 18:58 Martin Langhoff [this message]
2011-02-18 22:21 ` Merging limitations after directory renames -- interesting test repo Jeff King
2011-02-18 23:27 ` Linus Torvalds
2011-02-19 0:26 ` Linus Torvalds
2011-02-19 0:52 ` Junio C Hamano
2011-02-19 1:03 ` Linus Torvalds
2011-02-19 1:20 ` Linus Torvalds
2011-02-19 0:55 ` Linus Torvalds
2011-02-19 0:44 ` Junio C Hamano
2011-02-19 9:08 ` Jeff King
2011-02-19 10:19 ` Jeff King
2011-02-19 10:20 ` [PATCH 1/4] merge: improve inexact rename limit warning Jeff King
2011-02-21 23:33 ` Junio C Hamano
2011-02-22 15:39 ` Jeff King
2011-02-22 18:46 ` Junio C Hamano
2011-02-23 8:02 ` Jeff King
2011-02-19 10:21 ` [PATCH 2/4] bump rename limit defaults (again) Jeff King
2011-02-19 17:54 ` Piotr Krukowiecki
2011-02-20 10:10 ` Jeff King
2011-02-19 20:12 ` Ævar Arnfjörð Bjarmason
2011-02-20 10:12 ` Jeff King
2011-02-19 10:21 ` [PATCH 3/4] commit: stop setting rename limit Jeff King
2011-02-19 10:25 ` [RFC/PATCH 4/4] inexact rename detection eye candy Jeff King
2011-02-19 15:57 ` Linus Torvalds
2011-02-20 9:48 ` Jeff King
2011-02-20 9:51 ` [PATCH 1/3] add inexact rename detection progress infrastructure Jeff King
2011-02-20 9:53 ` [PATCH 2/3] merge: enable progress reporting for rename detection Jeff King
2011-02-20 9:56 ` [PATCH 3/3] pull: propagate --progress to merge Jeff King
2011-02-20 10:37 ` [RFC/PATCH 4/4] inexact rename detection eye candy Jeff King
2011-02-19 16:29 ` Martin Langhoff
2011-02-20 10:04 ` Jeff King
2011-02-20 13:16 ` Martin Langhoff
2011-02-19 15:22 ` Merging limitations after directory renames -- interesting test repo Martin Langhoff
2011-02-19 15:31 ` Martin Langhoff
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=AANLkTimsQmOLDENX27YqpicBeFFZrfgEAsLvFiJqoV7w@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=git@vger.kernel.org \
/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 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 NNTP newsgroup(s).