| changeset 47911 | 3d2c17c5d7f2 |
| parent 47910 | 50bed873a765 |
| child 47912 | 91afee6f959e |
| 47910:50bed873a765 | 47911:3d2c17c5d7f2 |
|---|---|
130 pass |
130 pass |
131 |
131 |
132 def copies(): |
132 def copies(): |
133 pass |
133 pass |
134 |
134 |
135 def otherparent(f): |
|
136 '''Mark as coming from the other parent, always dirty.''' |
|
137 |
|
138 def add(f): |
135 def add(f): |
139 '''Mark a file added.''' |
136 '''Mark a file added.''' |
140 |
137 |
141 def remove(f): |
138 def remove(f): |
142 '''Mark a file removed.''' |
139 '''Mark a file removed.''' |