@matheusbsbs / matheus-bagliano / commits / 8e6f38443e
Fork 0

Minor update to Subpro.txt

This is ancient in git timescale, but we see requests for subprojects support every now and then. The document talks about a possible UI level semantics and core level support. Most of the core level support is in the "bind commit" updates topic branch, except a few. Most notably, "update-index --bind" and "update-index --unbind" still needs to be written. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Apr 21, 2006 at 14:46 UTC 8e6f38443e97e150cd946d508104cad16fdd6bbe
1 file changed +13 -3
Subpro.txt
+13 -3
@@ -40,19 +40,20 @@ The idea here is to:
40 . Keep `linux-2.6/` part as an independent project. The work by
41 the project on the kernel part can be naturally exchanged with
42 the other kernel developers this way. Specifically, a tree
43 - object contained in commit objects belonging to this project
43 + object contained in commit objects belonging to this sub-project
44 does *not* have `linux-2.6/` directory at the top.
45
46 . Keep the `appliance/` part as another independent project.
47 Applications are supposed to be more or less independent from
48 the kernel version, but some other bits might be tied to a
49 specific kernel version. Again, a tree object contained in
50 - commit objects belonging to this project does *not* have
50 + commit objects belonging to this sub-project does *not* have
51 `appliance/` directory at the top.
52
53 . Have another project that combines the whole thing together,
54 so that the project can keep track of which versions of the
55 - parts are built together.
55 + parts are built together. The Makefile is illustrated above,
56 + but there might be other files and directories.
57
58 We will call the project that binds things together the
59 'toplevel project'. Other projects that hold `linux-2.6/` part
@@ -111,6 +112,10 @@ with `update-index --bind` command.
112
113 Also note that in this round of proposal, there is no separate
114 branches that keep track of heads of subprojects.
115 +
116 +`update-index --bind` is not implemented on the core side yet;
117 +it would involve backward incompatible changes to the index
118 +format.
119 ============
120
121 Let's not forget to add the `Makefile`, and check the whole
@@ -283,6 +288,11 @@ error: the merged heads have subprojects bound at different places.
288 gadget/
289 manual/
290 ------------
291 +[NOTE]
292 +============
293 +Again, `update-index --unbind` is not implemented yet
294 +on the core side.
295 +============
296
297 Their branch added another subproject, so this did not work (or
298 it could be the other way around -- we might have been the one