* Re: master 5fe9375 2/3: Merge from origin/emacs-26 [not found] ` <20190515001830.743C9206A2@vcs0.savannah.gnu.org> @ 2019-05-15 0:38 ` Glenn Morris 2019-05-15 3:02 ` Noam Postavsky 0 siblings, 1 reply; 6+ messages in thread From: Glenn Morris @ 2019-05-15 0:38 UTC (permalink / raw) To: Stefan Monnier, Noam Postavsky; +Cc: emacs-devel > branch: master > commit 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7 > Merge: 0f63e17 02bee78 > # Conflicts: > # lisp/textmodes/sgml-mode.el Please could you check the resolution of this conflict? ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: master 5fe9375 2/3: Merge from origin/emacs-26 2019-05-15 0:38 ` master 5fe9375 2/3: Merge from origin/emacs-26 Glenn Morris @ 2019-05-15 3:02 ` Noam Postavsky 2019-05-15 20:39 ` Glenn Morris 0 siblings, 1 reply; 6+ messages in thread From: Noam Postavsky @ 2019-05-15 3:02 UTC (permalink / raw) To: Glenn Morris; +Cc: Stefan Monnier, Emacs developers On Tue, 14 May 2019 at 20:38, Glenn Morris <rgm@gnu.org> wrote: > > branch: master > > commit 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7 > > Merge: 0f63e17 02bee78 > > > # Conflicts: > > # lisp/textmodes/sgml-mode.el > > Please could you check the resolution of this conflict? Yeah, it's fine, [1: e99a124110] in master just happened to remove a :group nearby [2: 7dab3ee7ab]'s changes in emacs-26, but the changes are actually entirely separated. [1: e99a124110]: 2019-01-17 18:25:00 -0500 * lisp/textmodes/sgml-mode.el: Try and fix bug#33887. https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e99a1241108433a63879a2430d55f2a1910d3c89 [2: 7dab3ee7ab]: 2019-05-09 06:42:40 -0400 Recognize single quote attribute values in nxml and sgml (Bug#35381) https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=7dab3ee7ab54b3c2e7bc24170376054786c01d6f ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: master 5fe9375 2/3: Merge from origin/emacs-26 2019-05-15 3:02 ` Noam Postavsky @ 2019-05-15 20:39 ` Glenn Morris 2019-05-15 20:50 ` How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) Noam Postavsky 2019-05-15 23:06 ` master 5fe9375 2/3: Merge from origin/emacs-26 Noam Postavsky 0 siblings, 2 replies; 6+ messages in thread From: Glenn Morris @ 2019-05-15 20:39 UTC (permalink / raw) To: Noam Postavsky; +Cc: Stefan Monnier, Emacs developers Noam Postavsky wrote: > Yeah, it's fine, [1: e99a124110] in master just happened to remove a > :group nearby (Personally I wish Stefan would just remove these :groups en masse rather than including them with unrelated changes.) > [2: 7dab3ee7ab]'s changes in emacs-26, but the changes are actually > entirely separated. Looks to me like there was a genuine conflict in sgml-syntax-propertize-rules? ^ permalink raw reply [flat|nested] 6+ messages in thread
* How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) 2019-05-15 20:39 ` Glenn Morris @ 2019-05-15 20:50 ` Noam Postavsky 2019-05-15 22:29 ` Richard Copley 2019-05-15 23:06 ` master 5fe9375 2/3: Merge from origin/emacs-26 Noam Postavsky 1 sibling, 1 reply; 6+ messages in thread From: Noam Postavsky @ 2019-05-15 20:50 UTC (permalink / raw) To: Glenn Morris; +Cc: Stefan Monnier, Emacs developers On Wed, 15 May 2019 at 16:39, Glenn Morris <rgm@gnu.org> wrote: > > Yeah, it's fine, [1: e99a124110] in master just happened to remove a > > :group nearby [2: 7dab3ee7ab]'s changes in emacs-26, but the changes are actually > > entirely separated. > > Looks to me like there was a genuine conflict in sgml-syntax-propertize-rules? Oh, you're entirely correct. And I think the resolution indeed isn't quite right; I'll take a look at it tonight, or perhaps later this week. Meanwhile, general git question for the list: Is there a way to ask git, given a merge commit, where conflicts occurred/were resolved? Even just tracking down the two relevant conflicting commits here was a bit annoying, never mind narrowing down to the relevant hunks. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) 2019-05-15 20:50 ` How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) Noam Postavsky @ 2019-05-15 22:29 ` Richard Copley 0 siblings, 0 replies; 6+ messages in thread From: Richard Copley @ 2019-05-15 22:29 UTC (permalink / raw) To: Noam Postavsky; +Cc: Glenn Morris, Stefan Monnier, Emacs developers [-- Attachment #1: Type: text/plain, Size: 2435 bytes --] On Wed, 15 May 2019 at 22:12, Noam Postavsky <npostavs@gmail.com> wrote: > Meanwhile, general git question for the list: Is there a way to ask > git, given a merge commit, where conflicts occurred/were resolved? > Even just tracking down the two relevant conflicting commits here was > a bit annoying, never mind narrowing down to the relevant hunks. > I'm no git guru, but here's what occurred to me: repeat the merge, then use git blame on the conflicted file. git checkout 5fe9375a51^1 git merge 5fe9375a51^2 | grep CONFLICT CONFLICT (content): Merge conflict in lisp/textmodes/sgml-mode.el CONFLICT (content): Merge conflict in lisp/files.el git blame -n lisp/textmodes/sgml-mode.el | sed -n '/<<</,/>>>/p' [Here I've manually removed the timestamps and truncated at column 70] 00000000000 342 (Not Committed Yet 342) <<<<<<< HEAD e99a1241108 346 (Stefan Monnier 343) ;; Double quotes outs e99a1241108 347 (Stefan Monnier 344) ;; hiding tags. We u e99a1241108 348 (Stefan Monnier 345) ;; if it's outside of e99a1241108 349 (Stefan Monnier 346) ;; the resulting numb e99a1241108 350 (Stefan Monnier 347) ;; (bug#33887), so we e99a1241108 351 (Stefan Monnier 348) ;; of quotes that doe e99a1241108 352 (Stefan Monnier 349) ("\\(\"\\)[^\"<>]*[<> e99a1241108 353 (Stefan Monnier 350) (1 (unless (eq ?\" ( e99a1241108 354 (Stefan Monnier 351) ;; Be careful t e99a1241108 355 (Stefan Monnier 352) ;; we're going e99a1241108 356 (Stefan Monnier 353) ;; just compute e99a1241108 357 (Stefan Monnier 354) (if (prog1 (zer e99a1241108 358 (Stefan Monnier 355) (goto-cha e99a1241108 359 (Stefan Monnier 356) (string-to- e99a1241108 360 (Stefan Monnier 357) ))) 00000000000 358 (Not Committed Yet 358) ======= 7dab3ee7ab5 350 (Noam Postavsky 359) ;; Quotes outside of d392b6e8246 355 (Tom Tromey 360) ;; Be careful to call d392b6e8246 356 (Tom Tromey 361) ;; going to change, s 7dab3ee7ab5 353 (Noam Postavsky 362) ("[\"']" (0 (if (prog 7dab3ee7ab5 354 (Noam Postavsky 363) (go 7dab3ee7ab5 355 (Noam Postavsky 364) (stri 00000000000 365 (Not Committed Yet 365) >>>>>>> 5fe9375a51^2 [-- Attachment #2: Type: text/html, Size: 3581 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: master 5fe9375 2/3: Merge from origin/emacs-26 2019-05-15 20:39 ` Glenn Morris 2019-05-15 20:50 ` How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) Noam Postavsky @ 2019-05-15 23:06 ` Noam Postavsky 1 sibling, 0 replies; 6+ messages in thread From: Noam Postavsky @ 2019-05-15 23:06 UTC (permalink / raw) To: Glenn Morris; +Cc: Stefan Monnier, Emacs developers On Wed, 15 May 2019 at 16:39, Glenn Morris <rgm@gnu.org> wrote: > Looks to me like there was a genuine conflict in sgml-syntax-propertize-rules? Should be fixed now. [1: e7e92dc5d2]: 2019-05-15 19:04:14 -0400 Fix merge of sgml-syntax-propertize-rules https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e7e92dc5d24ac3bcde69732bab6a6c3c0d9de97b ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-15 23:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20190515001827.19811.454@vcs0.savannah.gnu.org>
[not found] ` <20190515001830.743C9206A2@vcs0.savannah.gnu.org>
2019-05-15 0:38 ` master 5fe9375 2/3: Merge from origin/emacs-26 Glenn Morris
2019-05-15 3:02 ` Noam Postavsky
2019-05-15 20:39 ` Glenn Morris
2019-05-15 20:50 ` How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) Noam Postavsky
2019-05-15 22:29 ` Richard Copley
2019-05-15 23:06 ` master 5fe9375 2/3: Merge from origin/emacs-26 Noam Postavsky
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/emacs.git https://git.savannah.gnu.org/cgit/emacs/org-mode.git 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.