#1411 closed defect (invalid)
Changeset [2428] merged to both [2426] and [2427]
| Reported by: | Owned by: | Jacob | |
|---|---|---|---|
| Component: | *.djangoproject.com | Version: | |
| Severity: | trivial | Keywords: | |
| Cc: | Triage Stage: | Unreviewed | |
| Has patch: | no | Needs documentation: | no |
| Needs tests: | no | Patch needs improvement: | no |
| Easy pickings: | no | UI/UX: | no |
Change History (4)
comment:1 by , 18 years ago
| Resolution: | → invalid |
|---|---|
| Status: | new → closed |
comment:2 by , 18 years ago
Hmm, okay, but I'm left asking/wondering: what if [2426] happened to be something you didn't merge, for whatever reason, into magic-removal? By what you're saying, we'd assume that everything in trunk between the last merge-to and the present one was included in the present case, even if that's not the case.
(I'm sorry if I sound confused; it's only because I am.) :)
comment:3 by , 18 years ago
Just FYI, each merge to magic-removal from trunk includes every changeset up until a certain point. I believe this is the way the Subversion docs suggest doing merges, so it's how we decided to do things. So, in the example you give, that just wouldn't happen -- we wouldn't merge [2427] without [2426]. Everything's always sequential. Hope that makes sense.
comment:4 by , 17 years ago
| Reporter: | changed from to |
|---|
Note:
See TracTickets
for help on using tickets.
[2426] is implied because it comes before [2427].