Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: Holger Freyther <zecke@selfish.org>
To: openembedded-devel@lists.openembedded.org
Subject: Re: Reconsidering the work flow and how the SCM system fits in
Date: Tue, 11 Mar 2008 11:56:55 +0100	[thread overview]
Message-ID: <200803111156.55481.zecke@selfish.org> (raw)
In-Reply-To: <fr5neg$l26$1@ger.gmane.org>

On Tuesday 11 March 2008 11:38:07 Koen Kooi wrote:
> Graeme Gregory schreef:


> * track .dev: mtn propagate org.openembedded.dev org.openmoko.needmorebru

Non content conflict. ugh! What to do now?

And this has happened with the dreambox branch and this is why I can't 
encourage anyone to use branches with monotone. Even if there is some kind of 
management issue with whatever branch, the tool should not punish this by not 
being able to manage, it is a tool and it should do what it is meant ot be: 
Allow distributed development, and not being able to merge is defeating this 
purpose.



  reply	other threads:[~2008-03-11 10:59 UTC|newest]

Thread overview: 98+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-11  7:07 Reconsidering the work flow and how the SCM system fits in Holger Freyther
2008-03-11  8:05 ` Koen Kooi
2008-03-11  9:42   ` Holger Freyther
2008-03-11  9:59     ` Koen Kooi
2008-03-11 10:24       ` Richard Purdie
2008-03-11  8:47 ` Esben Haabendal
2008-03-11  9:32   ` Paul Sokolovsky
2008-03-11  9:45     ` Holger Freyther
2008-03-11 10:00       ` Paul Sokolovsky
2008-03-11 10:14         ` Graeme Gregory
2008-03-11 10:38           ` Koen Kooi
2008-03-11 10:56             ` Holger Freyther [this message]
2008-03-11 11:21               ` Koen Kooi
2008-03-11 12:25                 ` Holger Freyther
2008-03-11 12:38                   ` Koen Kooi
2008-03-11 14:23                     ` Florian Boor
2008-03-11 12:47             ` John Lee
2008-03-11 14:14           ` Holger Freyther
2008-03-11 16:11             ` Koen Kooi
2008-03-11  9:53     ` Koen Kooi
2008-03-11 13:43     ` Mike (mwester)
2008-03-11  9:41 ` Koen Kooi
2008-03-11  9:52 ` Paul Sokolovsky
2008-03-11 10:04   ` Holger Freyther
2008-03-11 10:25 ` Marcin Juszkiewicz
2008-03-11 10:46   ` Koen Kooi
2008-03-11 11:00     ` Richard Purdie
2008-03-11 12:30       ` Paul Sokolovsky
2008-03-11 12:39         ` Richard Purdie
2008-03-11 13:03           ` Paul Sokolovsky
2008-03-11 13:44             ` Richard Purdie
2008-03-11 14:01               ` Philip Balister
2008-03-11 15:39               ` Paul Sokolovsky
2008-03-11 16:15                 ` Richard Purdie
2008-03-11 23:29                   ` Paul Sokolovsky
2008-03-11 16:12               ` Tim Bird
2008-03-11 21:01                 ` Rodrigo Vivi
2008-03-11 23:40                 ` Paul Sokolovsky
2008-03-12  0:13                   ` Richard Purdie
2008-03-11 14:13         ` Florian Boor
2008-03-11 11:49     ` Petr Stetiar
2008-03-11 12:23       ` Paul Sokolovsky
2008-03-11 13:24         ` Florian Boor
2008-03-11 13:39           ` Koen Kooi
2008-03-11 15:49           ` Paul Sokolovsky
2008-03-11 14:12       ` Cliff Brake
2008-03-11 14:57         ` Petr Stetiar
2008-03-11 15:49           ` Richard Purdie
2008-03-11 23:49             ` Paul Sokolovsky
2008-03-12  0:09               ` Richard Purdie
2008-03-12  0:44                 ` Paul Sokolovsky
2008-03-12 18:38                   ` Leon Woestenberg
2008-03-12 19:00                     ` Koen Kooi
2008-03-12 19:09                       ` Philip Balister
2008-03-12 20:10                       ` Rodrigo Vivi
2008-03-12 20:26                       ` Leon Woestenberg
2008-03-12 20:45                         ` Koen Kooi
2008-03-12 20:50                         ` Stelios Koroneos
2008-03-12 21:34                         ` Paul Sokolovsky
2008-03-12 21:54                         ` Richard Purdie
2008-03-12 22:54                           ` Koen Kooi
2008-03-12 23:24                             ` Leon Woestenberg
2008-03-13  0:44                             ` Richard Purdie
2008-03-13  8:53                               ` Koen Kooi
2008-03-13 11:52                                 ` Florian Boor
2008-03-13  8:48                             ` Marcin Juszkiewicz
2008-03-13  0:18                           ` Rod Whitby
2008-03-13  0:59                             ` Richard Purdie
2008-03-13  1:22                               ` Rod Whitby
2008-03-13  6:33                                 ` Hans Henry von Tresckow
2008-03-12 21:11                       ` Richard Purdie
2008-03-12 21:21                         ` Koen Kooi
2008-03-12 21:40                           ` Paul Sokolovsky
2008-03-12 22:07                             ` Leon Woestenberg
2008-03-12 22:32                               ` Paul Sokolovsky
2008-03-13 11:29                                 ` Marcin Juszkiewicz
2008-05-02  5:30                                   ` Justin Patrin
2008-03-12 21:49                           ` Richard Purdie
2008-03-12 21:37                         ` Mikhail Gusarov
2008-03-13 22:29                           ` Dmitry Nezhevenko
2008-03-11 13:55   ` Mikhail Gusarov
2008-03-11 10:53 ` Richard Purdie
2008-03-11 11:19   ` Graeme Gregory
2008-03-11 13:17     ` Florian Boor
2008-03-11 12:04 ` Florian Boor
2008-03-11 13:09 ` Mike (mwester)
  -- strict thread matches above, loose matches on Subject: below --
2008-03-12 20:34 Mike Westerhof
2008-03-12 20:47 ` Mikhail Gusarov
2008-03-12 20:59   ` Rodrigo Vivi
2008-03-12 21:20     ` Koen Kooi
2008-03-12 21:52       ` Mark Brown
2008-03-12 22:03 Mike Westerhof
2008-03-12 22:21 ` Paul Sokolovsky
2008-05-02  5:46   ` Justin Patrin
2008-03-12 22:48 Mike Westerhof
2008-03-12 23:10 ` Paul Sokolovsky
2008-03-12 23:18 ` Richard Purdie
2008-03-13  0:45   ` Rod Whitby

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=200803111156.55481.zecke@selfish.org \
    --to=zecke@selfish.org \
    --cc=openembedded-devel@lists.openembedded.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