git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Feb 2, 2007, 23:01 UTC
Message-ID
<b0943d9e0702021501g2cb9bb6cocae0d706c8742868@mail.gmail.com>
In-Reply-To
<20070202224250.GF5362@nan92-1-81-57-214-146.fbx.proxad.net>
On 02/02/07, Yann Dirson <ydirson@altern.org> wrote:
Show 11 quoted lines
> On Fri, Feb 02, 2007 at 07:07:06PM +0100, Yann Dirson wrote:
> > > The t1200-push-modified.sh test fails after applying this patch. It
> > > looks like the 3rd test fails to pull the changes from 'foo' into
> > > 'bar'.
> >
> > Strange, it passes here, even after pulling you latest commits
> > (HEAD=fba895f5f12a652c248b0fd02b7c41f8342cfbdc).
>
> Wondering which GIT version you are using, I tried to run the
> testsuite with current GIT HEAD, and it fails much earlier (t1001).
> We'll have some work here :)

I tried the latest GIT and it only fails at t1200. I think I got a t1001 failure but I fixed it. Do you want me to push the snapshot I have and you can see whether it fails on your system? I tried it with both Python 2.4 and 2.3 but what's strange is that 'pull' run manually (not from the test script) seems to work.

-- 
Catalin
Previous: Yann DirsonNext: Catalin Marinas
Message 7 of 21 in “Update to stgit parent tracking”
  1. 0/3 Update to stgit parent trackingYann Dirson, Feb 1, 2007
  2. 1/3 The user does not want to mess with the refspecs.Yann Dirson, Feb 1, 2007
  3. 2/3 Rebase to parent branch after git-fetch in "stg pull".Yann Dirson, Feb 1, 2007
  4. Catalin MarinasFeb 2, 2007
  5. Yann DirsonFeb 2, 2007
  6. Yann DirsonFeb 2, 2007
  7. Catalin MarinasFeb 2, 2007
  8. Catalin MarinasFeb 2, 2007
  9. Yann DirsonFeb 3, 2007
  10. Junio C HamanoFeb 3, 2007
  11. Junio C HamanoFeb 4, 2007
  12. Yann DirsonFeb 4, 2007
  13. Jeff KingFeb 4, 2007
  14. Junio C HamanoFeb 4, 2007
  15. Jeff KingFeb 4, 2007
  16. git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".)Yann Dirson, Feb 2, 2007
  17. Yann DirsonFeb 3, 2007
  18. Jakub NarebskiFeb 3, 2007
  19. Catalin MarinasFeb 3, 2007
  20. Yann DirsonFeb 3, 2007
  21. 3/3 Do not return 'origin' as parent remote when there is no such remote.Yann Dirson, Feb 1, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.