git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sam Hocevar <sam@zoy.org>
To: git@vger.kernel.org
Subject: git-p4 workflow suggestions?
Date: Mon, 9 Mar 2009 15:21:08 +0100	[thread overview]
Message-ID: <20090309142108.GK12880@zoy.org> (raw)

   Dear list,

   I have modified git and git-p4 to a point where they are usable in
my work environment. I am now faced with a new problem: Perforce's
composite workspaces. They allow you to "mount" parts of the repo onto
other directories, even nonempty ones.

   Take the following example repository, where a "framework" project
contains an example subdirectory with build files and other directories,
and a "project1" project contains subdirectories that are meant to
replace the ones in "example":

   //work/framework/example/src/
                           /include/
			   /Makefile
			   /...
   //work/project1/src/
                  /include/

   Using the Perforce client, one can reorganise the workspace
so that project1/src/ transparently replaces the contents of
framework/example/src/ (same for */include). All the work is then done
in the framework/ local checkout, but commits may also affect project1/.

   I could not find a way to do the same with git and git-p4. My main
requirements are the following:

   - preserve the atomicity of commits affecting both project1/src and
   project1/include (having to commit from a different directory due to
   symlink hacks is acceptable to me, even if not terribly practical)

   - have git-p4 rebase work without requiring tedious merges

   - *if possible* (but not a strong requirement), preserve the
   atomicity of commits affecting both framework/ and project1/.

   If anyone ever ran into the problem, I'd like to hear from their
experience. Or maybe someone will have suggestions based on similar
requirements.

Cheers,
-- 
Sam.

             reply	other threads:[~2009-03-09 14:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-09 14:21 Sam Hocevar [this message]
2009-03-10  7:15 ` git-p4 workflow suggestions? Christian Couder
2009-03-10  9:57   ` Sam Hocevar
2009-03-11  7:03     ` Christian Couder
2009-03-11 12:58 ` Pete Wyckoff
2009-03-16 18:01   ` Sam Hocevar
2009-03-17 15:18     ` Pete Wyckoff
2009-03-20 10:31       ` Sam Hocevar

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=20090309142108.GK12880@zoy.org \
    --to=sam@zoy.org \
    --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).